diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index 013b97a68955a3ce7c4d687bc19ff9ac8e24cffa..250b2590a54f9a88f850f96666b82dcbdd15b19b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.1",
-      "network_address": "bordeplage-1.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.51",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-1.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.51",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-1-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index c627914bc29d1df15ae1a548822b808b0c02bb2a..09cdb454f04af007c227341f4b5988c41fffbc0f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.10",
-      "network_address": "bordeplage-10.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.60",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-10.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.60",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-10-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index 767aca56600f50d7d984b7d5e37795d6f8bcccf5..b010db5129564555cb8f28d3309a2f3a07c874cf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.11",
-      "network_address": "bordeplage-11.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.61",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-11.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.61",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-11-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index 5992b1ccfba50b849ceb5b194adb399b4409302e..5b57f40a907635f8c087811d582b0c6e9a113686 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.12",
-      "network_address": "bordeplage-12.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.62",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-12.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.62",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-12-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index bb5990ac0795d9f0f51650149a71fc606b0eec85..17fbe8f49cf7b2b4e04f8f280c1bcaf513129fef 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.13",
-      "network_address": "bordeplage-13.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.63",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-13.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.63",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-13-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index dff13497a73202010ffcc13e66b671bd9cc294c2..f1c246eec68db4aabf049518603d8de1ff081677 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.14",
-      "network_address": "bordeplage-14.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.64",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-14.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.64",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-14-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index f54f6beb6e5f53ae5da0c8be181c04b50da06cc5..6fdb08c2e54907e7933f84487b67314214ad954b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.15",
-      "network_address": "bordeplage-15.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.65",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-15.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.65",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-15-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 0306e6df46fcdb997be64b685abd51150ca76f22..a985a85c5f9748d18129948c800d983e7b7a9e3b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.16",
-      "network_address": "bordeplage-16.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.66",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-16.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.66",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-16-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 27ff969811c81d0666e59039d9ba039321d26b52..369ca03b9a92b934da53135239ff255f059bdad4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.17",
-      "network_address": "bordeplage-17.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.67",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-17.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.67",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-17-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index 55a9d7d8e20bfa88850eb02cb92c707627d091af..2f78d36230461323f3c829ee73f7b5e4f37136ff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.18",
-      "network_address": "bordeplage-18.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.68",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-18.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.68",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-18-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 763598473c39e65f14e91ccc85bec7b82986031c..1a1d62036fd8da563a006bc1ee566792e6f0e67d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.19",
-      "network_address": "bordeplage-19.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.69",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-19.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.69",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-19-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index d5f661d33f53293b0a812dfa580853c9e0c0ff35..e6a474c5438357ef2b6414fd78a97d5fee3b8329 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.2",
-      "network_address": "bordeplage-2.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.52",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-2.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.52",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-2-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index 7c41ce51f4cecd0a53fa05496f487d8495c4e747..d9a6daf3a88bfa303676ce4652deb7ab0128f28f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.20",
-      "network_address": "bordeplage-20.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.70",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-20.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.70",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-20-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 94efde3afe2d0ef7264748523725b2839e71f5c6..095eb6ccf5a44b5f3e0ff0c11b65581bdd470d82 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.21",
-      "network_address": "bordeplage-21.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.71",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-21.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.71",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-21-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index d6769111298c8b7dcbf27d0c35af6410f17428e9..e58ab607894450a77adc9a055a608a34d4c4ec04 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.22",
-      "network_address": "bordeplage-22.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.72",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-22.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.72",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-22-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index 76bfc33b6f2931a2a88aa75f3d67221f7b4355f0..410d8b9d5ba337bfbf038804c8cd0276dcc38e12 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.23",
-      "network_address": "bordeplage-23.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.73",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-23.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.73",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-23-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index 56179c1b23606027582c650056366033f9bd5446..2aa853ed273d80ab7483b754626853a317e010c7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.24",
-      "network_address": "bordeplage-24.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.74",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-24.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.74",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-24-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index ed8552d7666ddca3b8755fc09694f829861c6fc9..23a7ce2f11b3a5cc90f2b43884284e1bf95bade8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.25",
-      "network_address": "bordeplage-25.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.75",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-25.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.75",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-25-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index 06861b871ae4e5758a0dda8c17b16ac1f5c59c5f..902874d4b5fa862173b4d7f5d3fe554c55c1d6dd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.26",
-      "network_address": "bordeplage-26.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.76",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-26.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.76",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-26-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index 51437c0430f717ff9f1846b894a3005f5101ce65..a2a928e222b87c06c59ba08959ad1abc43e1e7c0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.27",
-      "network_address": "bordeplage-27.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.77",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-27.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.77",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-27-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 847505599112b47e0a25396305f82f4c235519d4..4c06d31f5c42f44f9e690e29f322de782183e230 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.28",
-      "network_address": "bordeplage-28.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.78",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-28.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.78",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-28-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index 1d67ecc00d30604c06c3c3ca7c31fcbf09c70c5d..c4116269a16ed45aca279aaefa7452993cb52a75 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.29",
-      "network_address": "bordeplage-29.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.79",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-29.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.79",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-29-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 61883904d73ff3245ba2af838f2a9b3ebd1c0d59..47f380b8015aacab4d6b8d3d57b45574044bec78 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.3",
-      "network_address": "bordeplage-3.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.53",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-3.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.53",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-3-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index 8e1d46a280dadfca29c4ac3d99c457e68b24dd50..ce96375b3955610d4615485a0907dfee2490459a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.30",
-      "network_address": "bordeplage-30.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.80",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-30.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.80",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-30-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index faf33ef082fee97f14c70f6f58162680226a6a69..52d450a3f2afe7adbc082aeed3acdd0c5fbc8ffb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.31",
-      "network_address": "bordeplage-31.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.81",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-31.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.81",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-31-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 1d257919431ca76a7296c4589084e24228064ab0..b35db7e79b1f1f5e3d041be0079509ff7ce6edd4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.32",
-      "network_address": "bordeplage-32.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.82",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-32.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.82",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-32-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index b363cd4d325ea0e31d0f8d7c180bc8e2754eb750..f180e91077d24fe00656b128c589f080f86d97b1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.33",
-      "network_address": "bordeplage-33.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.83",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-33.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.83",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-33-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index fb1c415be68dcafb7f01864acd274b2b72abbd9d..9a9dbd7274b3159d59ce27940fec5cd6ce272689 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.34",
-      "network_address": "bordeplage-34.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.84",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-34.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.84",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-34-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index a540d43d4cea9beece08b906b9abb8939cdb819a..cbbaf54e08b07b080fc44f3f0293e8da45d692f5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.35",
-      "network_address": "bordeplage-35.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.85",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-35.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.85",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-35-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index ae65b3fa063b1f35ead54e07dc889305b38215ba..38b5fc993393520864e90f10f882aae8e335b4f3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.36",
-      "network_address": "bordeplage-36.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.86",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-36.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.86",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-36-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 1de40c30b71c3e23889ca367c9dcea8a21f8671f..6d47b89e92d145743029aec3834edd93c8215d14 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.37",
-      "network_address": "bordeplage-37.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.87",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-37.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.87",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-37-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 41e95742fa491e365325ba676724890440008d96..2d6730e5dd4409cc3d1e73135e3ec0462795648e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.38",
-      "network_address": "bordeplage-38.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.88",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-38.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.88",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-38-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index d99bd9ce3978d6f2d0b810dff2378e587628fd5e..6af56be43cec761c436741aac8718c6b4420dee4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.39",
-      "network_address": "bordeplage-39.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.89",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-39.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.89",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-39-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index cbc31913eb9121809b4e54debbe58d316a30a1b9..2965b264a60409ecf53e2a6038590a42dd04bc0c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.4",
-      "network_address": "bordeplage-4.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.54",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-4.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.54",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-4-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index e564319f48883b68cd4f52be5a2b55fd65290002..cbf856b6f4ee69d8accea43d8f08dad2c8a25245 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.40",
-      "network_address": "bordeplage-40.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.90",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-40.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.90",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-40-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index 0fe809b1ea2f50cd0ce8844dae639626d2bd50a2..462df6751ba63a7b24e94721ac71459bd3a03c7f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.41",
-      "network_address": "bordeplage-41.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.91",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-41.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.91",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-41-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 9cb46b2edf6e72827b600e1a857d451c7a21148c..8805030b23960852c6f555d6a27869e0a4aa9ea4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.42",
-      "network_address": "bordeplage-42.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.92",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-42.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.92",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-42-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index a4bc4327b296ba001dfb5510ac62ef47d44ef4e3..e1f4f52f2fb8bfb7e67cbf9bdfcb52e0fb5ffb3d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.43",
-      "network_address": "bordeplage-43.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.93",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-43.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.93",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-43-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index a6b7608ef0b11a39da583c176a0ec62d3f43f4da..a4fb739bad3f405ed55518c933b0f3312d5b2130 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.44",
-      "network_address": "bordeplage-44.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.94",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-44.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.94",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-44-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 9254ce396b0872389073bf1968555d03e3a8c7aa..09837699c1d8a8159d4b4207bf01c0eea2bda4e6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.45",
-      "network_address": "bordeplage-45.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.95",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-45.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.95",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-45-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 576a7b1e085f0592b641e868e1bc00d86d948d1e..003dc0b1a7fe1e2ade555462eda09cd99719233c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.46",
-      "network_address": "bordeplage-46.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.96",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-46.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.96",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-46-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index 29288e342bb08f398f4da53b220a7843c2e11e29..0a4dfeffcefafddae94b0e5b28209f19c905d84e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.47",
-      "network_address": "bordeplage-47.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.97",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-47.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.97",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-47-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 6c23c3e3ae7e45173268f6daeb2f0b3f36d99f72..3dd54e06e22968778c5474490c01a1f31f8a0182 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.48",
-      "network_address": "bordeplage-48.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.98",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-48.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.98",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-48-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index cc47985c99147c9af7516f02ed61e34ec4011cad..b5842e8d79c1633b167baeabcd17b9e11e6e43a0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.49",
-      "network_address": "bordeplage-49.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.99",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-49.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.99",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-49-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index e2412f60715addcf3c9976d6766415d7a10fd758..174334a74a590e808121bbf43f39dc73d15d6d78 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.5",
-      "network_address": "bordeplage-5.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.55",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-5.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.55",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-5-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 4697ec5cda803d04ce22361476e8f9a92352f356..95601fe17b33121439e38bd1308f036469ddc2c9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.50",
-      "network_address": "bordeplage-50.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.100",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-50.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.100",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-50-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index e176c325f2f9a1f88a49e8c7e113abd3aa6c45e6..c937169d97d0fb0c611e98e64a00fe3d573d076a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.51",
-      "network_address": "bordeplage-51.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.101",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-51.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.101",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-51-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index b127402e5d22bf69f4298738f46e6078546fe6e6..ea3cd22c48595ac14bebd1a5ac6b1c508f8b91cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.6",
-      "network_address": "bordeplage-6.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.56",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-6.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.56",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-6-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 6d5d0c0f5d59ee36f77eecf170eeb7d24bbcd33e..ee0f0f99e68e134e47b4e5cb8a858207ddd32266 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.7",
-      "network_address": "bordeplage-7.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.57",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-7.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.57",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-7-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index ba2e08382b9f4c9f03c07bf557a2059d1f00eb46..a48885019011c63a88587baeba26134699bcfdd9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.8",
-      "network_address": "bordeplage-8.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.58",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-8.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.58",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-8-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index 501eda83435fd9225c2f8b642f42f4d1cbae162e..a2917386aa2facfce6885fb72ec3feac442aa564 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -10,34 +10,55 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
       "ip": "192.168.132.9",
-      "network_address": "bordeplage-9.bordeaux.grid5000.fr",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": "sbdp",
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
     {
+      "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.59",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordeplage-9.bordeaux.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "device": "eth1",
       "driver": "e1000",
-      "enabled": false,
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000
+      "ip": "192.168.133.59",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordeplage-9-eth1.bordeaux.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "82546GB Gigabit Ethernet Controller"
     }
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 14ef6577f5775ee3ee72956a80cb68ce909b8d75..3ee862c217701392ac30d1c102aab4d0d0716c8e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.102",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.102",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-1-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 0ae8fd8658917d5bb123bfa6cf5c59a8a4ea6196..017e4288991c78d77963e36036868560d0a75486 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.111",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.111",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-10-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index a59e8eb02c7c9c854505ed207a4c5e1a34a88994..9b66978e2ac81e275268e32d5c96e906ad5a1fc5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.112",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-11.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.112",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-11-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index c5d2d522d7eb5f4015c40397d09bbc3668ea59b2..e63dd48e643a0edebae7ff0c8413cb7ed141d367 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.113",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-12.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.113",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-12-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index b81bd598b42e1626374cf84cedeef729da069920..0459892cd41238fe6aa6b1dfb7f2779698d8c32c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.114",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-13.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.114",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-13-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index eab1891864e4a6bdc515ddd84834c5ae80ab67fd..6f67f219520e4a76daf069065e02a51b077bb493 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.115",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-14.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.115",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-14-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 1f874c84f786b1d0fe0ce04de779825f3f6732bb..2136a57eb34ec51030152610c4322b9aae40ab45 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.116",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-15.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.116",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-15-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index d72001f16a7177aa5d368b3d4ca58069bb4281bd..26a257f76ac7d49dc921c6c432388e260925240f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.117",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-16.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.117",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-16-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index 3bff231c8bdd7aa6be423d710b2c2c7f06db33eb..2b1d96bc893a6f825335922a4338516ef3cb132e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.118",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-17.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.118",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-17-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index 8e2b59203dc50d5a8b4b47f5403b6d3054687b33..cd87e7cd5c9331fd142e75af21ee3595c5753b5d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.119",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-18.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.119",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-18-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index 7506760a7e1cf73eb7eb5ccf36fc05f709fc3677..acedb82c263c8d06da2cb9a91415cb9173ceb8ff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.120",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-19.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.120",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-19-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index 765fecc24080731efb095073c478e9ebcc7085e3..dcfbbc87b386dba057e879858d022dae0a902e25 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.103",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.103",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-2-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index 9019f28976d9f3bffb88ee20ad89d7826557bed6..de763bf7ae81a73329e615feea425a660650377a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.121",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-20.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.121",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-20-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index 5dd438177699086aaf9c87ffb92a93f4199c684d..0341c09d8007300176c1f710908026905fece008 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.122",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-21.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.122",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-21-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index 7ee4ad822b4980674c1936727b26daf5854217f5..ed9b0f9f53c183dbfa6a531293e26fe6ca0a5111 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.123",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-22.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.123",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-22-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 00aa90d2f386e72358731af7f1bb118a6c394a97..e3b8e4c27e48029ff4cd426fc9c93b0f7ce0511f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.124",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-23.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.124",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-23-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index d31fb68c4b6f1c0c5fecb3f24933c4e40e573bea..55a04bc08b5da3e8c4b772a3c33f9458618f87e0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.125",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-24.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.125",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-24-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index 115d02494f6c3a45161968c46f058adc5fa13f04..9225a20b1fe7642f64802452b15a03edbd48feb7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.126",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-25.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.126",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-25-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index b2e06357e3af3f97c069412602b24bb67fdb1790..d6df5084ad92626a4fdba4ded814c3701d3d1f2a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.127",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-26.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.127",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-26-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index 1de2e9994de9e6de727147189947fcff7fa50413..bb4795e92102b899f8f249d75b4f9643cf3ef289 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.128",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-27.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.128",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-27-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 323305d012ea554132bf92db4540876927f08a29..00b16b6104a639cd0e66b07f170f43e24c392bea 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.129",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-28.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.129",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-28-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index 7e3e1bece64bb9a3af89d58663f5225bf8729a5b..2a2c7b594419af12af93f7addad516c941331851 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.130",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-29.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.130",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-29-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index c58d45e8e9dd37d6e2a21dc680b6d61bbf7356c7..2d9cf5e7fd8d59b7261fbc75a8d0d21023dc5280 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.104",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.104",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-3-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 48470e3be3ca406540f8be2a04f35db995a70e06..8d143a1b02ca2bd375c9b77bf7b758f1db7d3f66 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.131",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-30.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.131",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-30-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index d2763a37e70312bdb3957336a1217f641032aca0..674f377c48599cd18793681df8d2745789fb3880 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.132",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-31.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.132",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-31-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index 523a73256abf616fa2d97676ef4ea93eda115046..b5c9bc98dd6e090976e246f39b5a11416e3d0c55 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.133",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-32.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.133",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-32-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index 5edb6e77948d4af1f78cfe2c4e851b5103ae4b29..33d49ae211ec674136c72912b11955574535271a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.134",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-33.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.134",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-33-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 125548e5aa8d85c66531cb6b8cc330defbf25059..bf01f61e158a5ead0efc77ffcfc17a24acc7097e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.135",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-34.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.135",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-34-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index c2a3159e5aec61de857858986581b8260dd4eca1..ac78d081de43958c5e3dc46c15a1abedafdf2c9c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.136",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-35.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.136",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-35-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 84a882f077b99ad98975e2b5bdfbcd807a203b02..2d092cb8701ed539d5f3a0b3497db5a795e0eb8d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.137",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-36.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.137",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-36-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index dd0b92fa7571e08d234b3834257996a5488f1dd4..11cc1903fbdfe780fa68b76cb1cf362bb3610bbb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.138",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-37.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.138",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-37-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index b14775251441874410b3018c661e12ef68b57ef4..eda3a32175c9b07a9dadf0bbb4c1efc36e53fe0f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.139",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-38.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.139",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-38-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 655757e1e3166b25042764219c3a080397b2640f..0fd23e9313994c4f63656ba7fcad4f75bb8b5a66 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.140",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-39.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.140",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-39-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index e8cc2bdebbc848ab6b554918416ce4cfd9f05a97..c3a7b4bc726143acd3544d7259bd8fe3959c1fc0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.105",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.105",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-4-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index 1d69d8e8d4dfb18dd3e9ad7831678147a3edb75e..ba508985d0fb8060fa75bcf73d4f55b8b4a163f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.141",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-40.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.141",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-40-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 597e2610dee75920735ecb081340ffa8123414ef..2e6eff565206be9da82bfec949ded06a7cb55b33 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.142",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-41.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.142",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-41-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index c0acc7ce89a889222cf18cf62b0b6d417259a22b..1f2a8754338cc439503492d4c514d90ae3c8b899 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.143",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-42.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.143",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-42-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 606b700d3cec2b417bad2c2f13a7e92c89a430b9..46eec6ea199927a67e0456e48471bc00e666bb93 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.144",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-43.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.144",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-43-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index c14ac539432fc68a454c737137efe989003f875b..e9df3e625d19e1a78ef2e61ec81820c566af172f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.145",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-44.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.145",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-44-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 539f0fb33a4aa192fe2ad9137c7c7e453d4b5e77..6b7ba66dfd21b896e9fd315af8f85b54b0872aa3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.146",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-45.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.146",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-45-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index 86c4ae85e90b9c094aaa8f80790cb48809111892..08b83fb73c28477318db189f8bd7d349a19f6fac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.147",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-46.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.147",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-46-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index 4532c47b88018f88e2879c444f0ff27f5a9bca8f..0064e36db4f8171f7dfabba032e14336f9327a12 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.148",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-47.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.148",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-47-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 3f2766b61086dcc756d529fbaa9761ca3878a062..257f1656b9ccf02c0b27ef9d8f9a92d4db4673bc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.149",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-48.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.149",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-48-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index b9618669c60d190fd66000f1b88a716c793a20d1..ae28986129cad68abdeff3ce9571cbabed7d8fae 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.150",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-49.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.150",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-49-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 5a998efa3510f0d9fc528a89b45f74a6502787cd..69a75ebbd9957f96ea5c5f38809df5799675fbc2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.106",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.106",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-5-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index eb744055dec915712f10205e80e8fc7e179724e9..7aa70eada11fc124a459294b95418fd2bc065ef9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.151",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-50.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.151",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-50-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index eac18c64bdf07b0eed987838a7e2496acd5b51a1..0882d9618cca1735ab319914292fb6f67bdafa66 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.152",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-51.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.152",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-51-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 32b5cbbbe9cb8d4bfae641686a91d55b7ebb24eb..5981eaadb868df9c54e11cd05e75c1dce35b1879 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.153",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-52.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.153",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-52-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 81d35b94c77dee162fb0d5774ba27b00e134b50e..6bde2862d54446e03c4bdf6578ec8a94978dc8ce 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.154",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-53.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.154",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-53-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 956c4bbe40c9f226d995c3a7029400febd32b026..1d0456840a3d4088aa9294f50631a8893179e79a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.155",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-54.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.155",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-54-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index 452358037f2ab154ab0a8d11bf1b8a79a788624c..efaecdb8b57a20e79ba59714ee9285beadce9457 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.156",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-55.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.156",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-55-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 9dfe650b73253e4f6c49a5b88c09d9756ca4a682..76eb7bde90cc6e54994b42f9e580802fb7f80540 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.157",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-56.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.157",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-56-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index 94f5d7ad83e59609652fe9fafde6c63c8fced092..a4fde9563fa6271d6deacbec93bdb01834ab5ecb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.158",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-57.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.158",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-57-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index dbfd58d72217b250460e1223ffca01b609e3b2bf..1af56e359b0556f43bd53cdf392fa590a8002433 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.159",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-58.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.159",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-58-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 577c732e47d6f76a4d7fcf8fe41542c805fe85c1..56528138257f9950591a113d86c8d2541200a5fe 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.160",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-59.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.160",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-59-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index e9756a159deb79baed18796db9b85bc556c7c621..e5229aec9557fe5dba3e6fc45581fc8f60e130f6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.107",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.107",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-6-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index c06942a0d1f5a371903f383dc4ece424d344ce86..629c1c10665a6fab6e0d32986ac9bc6575754118 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.161",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-60.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.161",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-60-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index 4c9f50eaf447305f7bd99c6094231e17caa3ddc3..bf6868deb943248d40a936c84d9a853cd6b81a1d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.162",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-61.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.162",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-61-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 5319c11e0c8a16bfb31b7d707944461edf744ed7..550754c13d6fce862b3e208e9414dee295a0c8cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.163",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-62.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.163",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-62-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index a2e3e5fd4370a5cad60f592c79012577227ea55a..1fe755d6dcc89348546c679ec9674cadc2ee1b17 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.164",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-63.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.164",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-63-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index e1b4ff6bccbbe7e36e89682e4f01bd73c77b24c8..b3a42cc63305ed932a2d3a8ec170152166c0a304 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.165",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-64.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.165",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-64-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 91c0bf91f2debc3424f54cfa8b09340d9f965f3b..75e23278daf33120123c484a8c0d79f2ed8b8d26 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.166",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-65.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.166",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-65-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index 2be1f113b931d6f1bf30897d8389b801b113be49..bc36a4495c967e25a7044732fa6b2cb4867dcd60 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.167",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-66.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.167",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-66-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index dd8c224021ed783caa2e070fb6efb0fe1a492dbd..144cac80a50a82810c01bea77204a2ed5681ae15 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.168",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-67.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.168",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-67-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index f15f3cb5c626347be972f58947bf0a22244d86e2..78d7092c554475f93dab32b80f45972147131dc4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.169",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-68.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.169",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-68-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 9b99f73f9abccaab92d3dd53474be0d1d541cd3f..588c92dde49b306a96cf7623ffdd66f723c41394 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.170",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-69.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.170",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-69-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index 059f2f6a72aea1a0eb343394927887cf8a180759..cf05245ca1acbcbe14c6420b4e56e4175ae6e29a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.108",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.108",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-7-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index b005d3d866fdac177f1267496b3bab3077cfb7ab..0fc0564a92c210d0a1ad62105c202b992b986075 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.171",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-70.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.171",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-70-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index 553fb82a1e7e4cb5fd146468feef4377b7481bb9..9b4f50e0cf1541962ca6a5373306c9febf25c8b3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.172",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-71.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.172",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-71-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index b45bbedc4665b8c10261dd3a3d6781bbd5c9ae6e..9f1438a7f67668cc67cc7798e417478da8349a4d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.173",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-72.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.173",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-72-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index 97cdf077e5bf96b523fbd22813d1e701a1843d32..7768e4c295e184598861445a73bee44dc75e9677 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.174",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-73.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.174",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-73-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index 6aeb670e6098c4bc907663cf3906915fd5d51088..d6cd9f8495223567ab4bbd6d3950dd3424e6fdf2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.175",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-74.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.175",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-74-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index 3f39009a6f974e4493830ce2ba1c2e641936139c..de5042f75cd0427ef6567b4803f98827c7bd0179 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.176",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-75.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.176",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-75-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index ce28698bf5157daa39f222dba1a2157de1f195da..8552de2f754a66db24d2b7caafb942673ff5bde7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.177",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-76.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.177",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-76-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index 48ba03ebc6b6a07331d5fce9cfa6ce296d6fefce..a001c4920cea01170dcd7421e0b355a1341195a1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.178",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-77.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.178",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-77-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index 7ee1af55541c5e19501bfea4ab621b83b76d3b25..da62373a8b71a2303c9b8168094d409b243b0b03 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.179",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-78.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.179",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-78-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index 7633d28d930ad3d29db63754b2cb60be461be883..8080b0b51b64dbeb3d9ea2593c35adee191a89db 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.180",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-79.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.180",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-79-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index df862566c68b68454f28cb043310ebf9fd6aa484..c6b9832950ba494d5e6b75bcd81a02bc56a2d7f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.109",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.109",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-8-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index a41fd8b4bb7bd7463778be0844743c1c93f9f5dc..5a92c98043bb08e85aecab21de7aa9c895d2a5d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.181",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-80.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.181",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-80-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index b49f449c4b804cffe57ff18391a75a40b878e9b0..680f2a10bb6b9067ed1d532c82cf071f0bb62665 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.182",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-81.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.182",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-81-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index c0ad0a9be61eacc896f2b848c54781a152e1d880..2bfe3e5f779de4389ecd8b1be1725fa6cd8762d8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.183",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-82.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.183",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-82-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 4585a8a9a176e52a0c90182c42905c8ecb722875..3e421ba3d20e61a940d6105918f92a13c7834857 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.184",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-83.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.184",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-83-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index 47799a572000cdb1005daca722180e0f0b98a6c6..6600f2b2d6182a0db76f8cb1397a79dfbf9e273a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.185",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-84.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.185",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-84-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index 477b45b4b07f808fc47c2c9bf04dc1a8a2f269cd..1ae2df403cb89cccf7eb85c74ff249cb12f3a8cb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.186",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-85.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.186",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-85-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index 776adb2eb9d3f6b9b7826da10f2048473cbbac8d..7e6b7cbfb61b346f3148d03c8be11cdf2118ec99 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.187",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-86.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.187",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-86-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index a08eaa044df5b38070b77d370c7599dabd37076a..cd461d1c7a35378b0ecf96d8cdd75e4f1a6ff166 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.188",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-87.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.188",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-87-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index cbc0634a6d233a27671328ae679c1da607870cdb..ac56365e3dabbb7c0e2ad1dc2babccca9d2c3653 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.189",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-88.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.189",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-88-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 863f0b481b7ba9786823778d363e19b318e9e20d..5146358a7abd74d60df473d2a2153f8ef5d97bc8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.190",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-89.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.190",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-89-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 63ee74a54818658d04761e215f8f907f1013a89b..4d0ccf55e8d41ceb1dc0786150054587fca24f8f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.110",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.110",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-9-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index 287afb9493e12736c9961c7035a42284e6cc787b..c77181c6d1664242ce90d51b8df705c8b243dbb1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.191",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-90.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.191",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-90-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 7dcd93c0440846edfb58e20cc992c2946c18eb2d..a8dbf3bcfa7d75d134f9c8ed5a3e938f8e285b2f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.192",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-91.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.192",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-91-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 8e923b2cf03d4405028444c624bef4291fc2c671..6ce0d2d258dfcec192545ff6f37f92dccc959ceb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.193",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-92.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.193",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-92-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index d76377bc51269a752697267986f250dfa9e7689a..7dd9c10cf6d927deb50abe5d74324497c2f6b018 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -10,20 +10,31 @@
   },
   "network_adapters": [
     {
+      "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.194",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
       "network_address": "bordereau-93.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
       "vendor": "Broadcom",
       "version": "BCM5704"
     },
     {
+      "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "192.168.133.194",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "network_address": "bordereau-93-eth1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
@@ -31,8 +42,8 @@
   ],
   "operating_system": {
     "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "2",
-    "name": "Debian Sid",
+    "kadeploy_version": "1",
+    "name": "Debian Lenny",
     "release": null,
     "version": null
   },
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 8abf8f1c8262377012ab01f80ed92ef6bce9ec15..2e57725df7a47b6a7877c205b6934554ab6554f4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -10,22 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.196",
-      "network_address": "borderline-1.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.196",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-1-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
     {
+      "device": "myri1",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.196",
-      "network_address": "borderline-4.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.199",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-4-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index b09238aef0b513b09704909c53e2ef3434544b6b..4f903b59bca2741fdd29adaa6cbf17e0b2f08685 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.205",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-10-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.205",
-      "network_address": "borderline-10.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.205",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-10-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index 5032a8e09cfeb9931a63f05524540b52ea4e59ff..907bc28abd05954f51c7497b8d26d5a1276287ad 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -10,22 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.197",
-      "network_address": "borderline-2.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.197",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-2-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
     {
+      "device": "myri1",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.197",
-      "network_address": "borderline-3.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.198",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-3-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index f36eb061619731532ad41c91e8eb13741f6d451a..94ffd5f45471b29169a64c8a69ccae296f016a5c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -10,18 +10,34 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.198",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-3-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "ib1",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.196",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 6a03976023b924fa8873611a2fb04191f06e9d96..e6052dabe3b26b5e37bb7af5726a4897c5cce5af 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -10,18 +10,34 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.199",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-4-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "ib1",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.197",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index a59f1de50587e10e3c6ebae753f69dd99c2ad373..ea87edcc29524cc5332b2e424a59d881e164ece3 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.200",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-5-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.200",
-      "network_address": "borderline-5.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.200",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-5-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index f8d631456e3f11284b7380affe26236edad31feb..f4c833eee0e5e10678ec19ab7fcfd240db24f745 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.201",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-6-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.201",
-      "network_address": "borderline-6.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.201",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-6-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index 6ec7a79ec86f097ad649b5e93708840fb36e1d7d..602dcb90331fb777a08c44243e6290676292dac4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.202",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-7-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.202",
-      "network_address": "borderline-7.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.202",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-7-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index b8504f82b1c588e7a17c9aeb328d5a0e678cacf3..e9cf53e7d7ddb2f0aad9ea214395f53fb4a48c3d 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.203",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-8-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.203",
-      "network_address": "borderline-8.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.203",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-8-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index 32bfff00c36dc3de0b2bb32ff534a678f4b991c6..c04eb0326e5b3223c56664ec35751efa5110a49e 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -10,19 +10,32 @@
   },
   "network_adapters": [
     {
+      "device": "ib0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "InfiniBand SDR",
+      "interface": "InfiniBand",
+      "ip": "172.16.4.204",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-9-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25408"
+      "version": "InfiniHost MT25208"
     },
     {
+      "device": "myri0",
+      "driver": "ib_mthca",
       "enabled": true,
-      "interface": "Myrinet 10G",
-      "ip": "172.16.1.204",
-      "network_address": "borderline-9.bordeaux.grid5000.fr",
+      "interface": "Myrinet",
+      "ip": "172.16.3.204",
+      "mac": "",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "borderline-9-myri0.bordeaux.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     }
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index 200a889c81e2c123574e9cdf28a9af254fccc4b1..3224ec795b7f3ee3dae066d7e48f302fdf815b8f 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -1,3 +1,7 @@
+def get_macaddr(node,interf)
+return ""
+end
+
 site :bordeaux do |site_uid|
   name "Bordeaux"
   location "Bordeaux, France"
@@ -52,13 +56,21 @@ site :bordeaux do |site_uid|
           {:interface => 'SCSI', :size => 70.GB, :driver => "mptspi"}
           ]
         network_adapters [
-          {:interface => 'InfiniBand SDR', :rate => 10.G, 
-            :switch => "sbdp", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-            :vendor => 'Mellanox', :version => "InfiniHost MT25208", :enabled => true},
+          {:interface => 'InfiniBand', :rate => 10.G, 
+            :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+            :vendor => 'Mellanox', :version => "InfiniHost MT25208", 
+            :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
+            :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
           {:interface => 'Ethernet', :rate => 1.G, 
-	    :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), 
-	    :enabled => true, :driver => "e1000"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), 
+            :vendor => "Intel", :version => "82546GB Gigabit Ethernet Controller",
+            :enabled => true, :mounted => true, :mountable => true, :driver => "e1000", :management => false, :device => "eth0",
+            :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth0")},
+          {:interface => 'Ethernet', :rate => 1.G,
+            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
+            :vendor => "Intel", :version => "82546GB Gigabit Ethernet Controller",
+            :enabled => true, :mounted => false, :mountable => true, :driver => "e1000", :management => false, :device => "eth1",
+            :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")}
           ]
       end
     end
@@ -103,10 +115,17 @@ site :bordeaux do |site_uid|
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"}
           ]
         network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, 
-            :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5704"}
+          {:interface => 'Ethernet', :rate => 1.G,
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+	    :vendor => "Broadcom", :version => "BCM5704",
+            :enabled => true, :mounted => true, :mountable => true, :driver => "tg3", :management => false, :device => "eth0",
+	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth0")},
+          {:interface => 'Ethernet', :rate => 1.G,
+            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
+	    :vendor => "Broadcom", :version => "BCM5704",
+            :enabled => true, :mounted => false, :mountable => true, :driver => "tg3", :management => false, :device => "eth1",
+	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")}
+
           ]
       end
     end
@@ -149,28 +168,54 @@ site :bordeaux do |site_uid|
           {:interface => 'SAS', :size => 600.GB, :driver => nil}
           ]
         network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
+          {:interface => 'Ethernet', :rate => 1.G, 
+	    :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"), 
+	    :vendor => "Broadcom", :version => "NetXtreme II BCM5708",
+	    :enabled => true, :mounted => true, :mountable => true, :driver => "bnx2", :management => false, :device => "eth0",
+	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth0")},
+          {:interface => 'Ethernet', :rate => 1.G,
+            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
+	    :vendor => "Broadcom", :version => "NetXtreme II BCM5708",
+            :enabled => true, :mounted => false, :mountable => true, :driver => "bnx2", :management => false, :device => "eth1",
+	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")}
           ]
 #some cards have been swapped between hosts - refer to bug 2681 for explanations
 	  if i == 2 or i == 3
 	  network_adapters [
-		{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
-		  {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true}]
+	{:interface => 'InfiniBand', :rate => 10.G, 
+		    :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Mellanox', :version => "InfiniHost MT25208", 
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
+	{:interface => 'InfiniBand', :rate => 10.G, 
+		    :network_address => "#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{i-1}-ib0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Mellanox', :version => "InfiniHost MT25208", 
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib1",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")}]
 	  elsif i == 0 or i == 1
 	  network_adapters [
-		  {:interface => 'Myrinet 10G', :rate => 10.G, 
-		    :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
-		  {:interface => 'Myrinet 10G', :rate => 10.G, 
-		    :switch => nil, :network_address => "#{cluster_uid}-#{(i-2)-(i-3)*2}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{(i-2)-(i-3)*2}.#{site_uid}.grid5000.fr"),
-		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
+	  	{:interface => 'Myrinet', :rate => 10.G, 
+		    :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")},
+	  	{:interface => 'Myrinet', :rate => 10.G, 
+		    :network_address => "#{cluster_uid}-#{(i-2)-(i-3)*2}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{cluster_uid}-#{(i-2)-(i-3)*2}-myri0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri1",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri1")}]
 	    else
 	    network_adapters [
-		{:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
-		  {:interface => 'Myrinet 10G', :rate => 10.G, 
-		    :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
+	  	{:interface => 'InfiniBand', :rate => 10.G, 
+		    :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Mellanox', :version => "InfiniHost MT25208", 
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "ib0",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","ib0")},
+	  	{:interface => 'Myrinet', :rate => 10.G, 
+		    :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+		    :vendor => 'Myrinet', :version => "10G-PCIE-8A-C",
+		    :enabled => true, :mountable => true, :mounted => true, :driver => "ib_mthca", :management => false, :device => "myri0",
+		    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","myri0")}]
 	    end
       end
     end