diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index 90dd21710fbd98fecee718b47a135bbde31efc75..66ce0e9adac3f266d3dbe647ace9a807b9f3d5fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index a5dcaf40fd5eb1d71a6ccad5f941c65a0c06ccf2..a33e9b7a33845cd066db5b9e3c5785e638e502d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index bdbf8aece846667e91bba414bede4787224e9cf8..4cdf2aa0f473d33570a8dd0ba59f14b4f36af52e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-100.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index 4a13fe98e0312d8eff8c7f26e3d5a3cccfd78d19..5f6db10b63d2a9721196b243d64f5b9fc4b6f032 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-101.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index e1ced9e8621ac7f56b17f72645a8c5bbcf76e046..f5f08906448e5b0b2712b13b68b7dff28a1142a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-102.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 132c8eb21c0d07c64df7dcf51f41415cc2db2dad..1a3880458886945cc27a273160c6b5acb717bad9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-103.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index 2f229713ff153701124ca0c4e63f1337bb431b4d..38ac3d12694ad6c6875154bd4fe8d90c4cf73f36 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-104.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 082b1c1c75a940cbdfeafd71ef3d78ee51e6334e..b674531f8e6f1add3c58ff8b2027a4216dfb17c8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-105.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index af12d62643848cfde327865acdfbcb2e214d2753..a7a8f9024024ece427b5a4a94c39997e1e3e78a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-106.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index fcbbc664571aedbb2be272095cde9f64af3c9bd1..0a2eeb7e82fcdc14c56946dc5f31507f1ab3c8de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-107.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index 2a8871aebd0735f124334bac8d41f3f9680f7e29..9ff1024e86af26bbd20b09c0ec9f18ab829e2b09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-108.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index fc45ea27beb280aac429b1a7b86de651ea5d09b1..f2ef8e416966d6ad5e6265395eb4466c42473cfc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-109.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index 6d952c49f8c725bc3698e3c409f2ad165126abbd..5d129f827ae59656f17011dbf349db28a02e5de1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 1a1150f58d762281e7d6cb6f6c03f172e8f48dac..06c0080e02a4d4fff5827b0968d04508bf944026 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-110.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index 317ccf8952784be6407025e0b3f613970c22476c..1cb21eb295744642329698ca8a30c515da2615c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-111.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index ab8dfe29d480d9b4e0b53bac4524aada043ec7e2..e9aa2f4548b75a5bff9f186fb6089ac8305167b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-112.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index b0fb141cd982ec91f01e2eb61dd8f464fa6f47ee..106a8af3cad2dc2a881843001085bb4c9774b198 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-113.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index dfef0cc4b21e7c71ab67777ca780cbd11f2ac0e7..37e8a8d8f59a4ac5fbf39d7b614233b41f0e256c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-114.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index cf669191b6c7903d02d791372ec2d302cd30759d..b2b88fcf11c7e47702112eea7f573e4b19ad0315 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-115.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index 61d10464c8900445b5ad183510eac76a91a8a6b4..feaa18cec0ab3bbd18c26fbcf30fbc1fcbe1fe20 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-116.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index 88b1011bdbfa41378fc14df07dacc0b9ada29f4f..ca4151908d9030da83de82cbfa939629f6c7b21d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-117.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 134220a9123320cfa9476ea6ce180c7b879c414d..ddf1d32497fcd98849c59998e642cb75d77e5af2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-118.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 6bbb545a94f3432f8a26356bd8eb830fd9d42eaf..7d00cd078ee4f67acccb5e18f6420524b4ebc7c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-119.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index 5d10dd5136db89d2ef5aa650d707307d62ba720c..43aceeaa968a77bda532d23625b63c67c7e508a8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index faf6b62311347d67e0cac7fcaacdbaad08f7f38f..4c49c9e3710c0cfa74aaa7acd943224b7a39553d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-120.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index eb018c4aa1bca2d612d5a7bf356d84f70d3d845a..41442955338ef2f2d416f26e0a49b6a1265cd0f4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-121.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index df9d80b251f90b67647d692f2b31886a7ad3100e..b1fb09da2d13182f478320159e1f27305bd40a5b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-122.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index 0b7b7bfc1cd60a287eadbfb40959784d03c6d40a..f174b5b5cc51b803ee54a87bb614e258751f9852 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-123.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index 7676be2be0d39633f6b391c8ba418bb3bcb939e0..e410fd3712e2bc829a99ac91cdb3f80e93910308 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-124.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index bda55178ed5863c994c98c240b413297dad1d295..363348d21dedf7f32b4444b7173dc7c159d03c02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-125.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index 98b9eaf06b944aa5223a1442c81edbc5412ed6d1..1adb65e56a1589ea5a5dcaee36aaca0a73c1a658 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-126.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index 9610c16985f057dfa70ce28c52e986f7c3567359..a6c697354ccd1dc9b7e53cea7b2594d885243a1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-127.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index 7aa1a044f018704a76dd2f22906c95f3420ff216..fa41e00dc89ffd68ce81d87b49adaca830b8e77a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-128.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 9739eaef49e144744dfe9b2cbca275cdaa856fd4..7291bd5c2dbefd7dfcbe0fae651e5b2667ccbfa8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-129.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 6e40050f51db7b671a52d649dae288c8cd71c013..56bb8281f4614c0501c3834cfe19016e7f66aa49 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index 4ed0fc099c01c4dade6d0ee65ce3f873539a832b..5cd88c02135ac7378c3cc5367c45b9a3f6b87faf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-130.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index 1a7825ccd8e9600afd34fb1666c6c6db242fad3c..132d5a05a43c16740da740a6c91fbaf3eea642c6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-131.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index 59525cc9536adcb7bfdbd488c6c503d0574d14b2..166426f15c103e1bcfde177093fafe3ba5ba812b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-132.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index c7d3f98baa1bb2af964d6f9726ad3e8992da4484..9a86288565aa11ce13d94be53d8aa4381f28e61d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-133.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index a4f94a541a53fbee4b9184684a146b239826969d..76be4bc5a74552eddfced11b64f858591bbca1d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-134.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index b6a8aab6e7fdb8db7bd7e49582e5567a9c2a32da..af3925885a6c5db6402e936318dd3408665bce5d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-135.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 8ad03ac415613a29d3b0a4ab4cd618902f985747..cb4c1ba58c4b329426ff6a746d4a389c32d1b87a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-136.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index 53b33eb63a31fe2ed2dc4a406335864bf423373a..77f553a158efb138cef9d5bdc1655f538e6912cc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-137.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index 5a31fec58907844e95d5f13aaa32f35b81233146..271a575019a1a9c8c433bb06ee47ed938173947a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-138.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index a13eabab767c9c9063edab8f741a65424f45c0da..683b756f5dbb96eeb0dcfc8d533f0715b6720fdf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-139.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index 2f76f49000790d7da87509e713ace8f14fdda954..f771593dc53f8f34f7a3abf551577c6b2864bee0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index 1109264a6a1b31368c68fbc36b455e0ec30d1f68..2eeddc208e1f404bdc2df25f6a9f918e6c9a8e46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-140.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 64d310e0cb9a4eb8575816ac5681f559becdfb35..3905b4bc7cc2a5c2fc6b08c3360742c3fd3bd214 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-141.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 950156a7612e11d3e66f170651bea72ae5512009..4961be007a648cf2d04bf9cc9ca57655f459a82a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-142.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 2004f54fbb057e9016b04f8d39fd3de6dcf8b813..96a64fe2bd9373d7d6baf28d3a477eface2153c9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-143.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 58eab3625ae0d42ed32e9517fcd8bebd48e6a420..4e356b2a75544053d4ff47b95b7f1f4677b8e33a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-144.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index df3af6503a3955166bc5431185c647600d8ca179..3802ec2758564cfc392e126824d7ec3ae25cc78b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-145.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 7bcc68edae69144775054abbaeacb16948d7e754..e93698b4d2e4d0c2d24390e982cc925de2df1fc7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-146.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index fe8ad1cd768a413d92214b09a6b8519887306919..839752c02efec5d6441695777693651d9b2d1b06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-147.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index e9eb30e0390205f48c431ba114d06cf8c81641fd..3cda75aa490af36cf664c2dbf891a5e1aabb8108 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-148.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index d71f68bd08e7095d870df41d106ee38fc0b51e15..ff4a75dc4147fe1d21e7318e8fcc6568c6804d37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-149.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index ac1ca1bf395365f5f8a5256d207be0fea91288f1..b4a41c711fd9a1779649b3508486cb040b269592 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index bfa3dd356b1454e0b26ac853beb90125993b9c28..5c26613c1ac1700f9b34b1b1c5a544b55480b989 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-150.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index 6cafafca1fd9aded373aede1cd2001f7b0839f7e..ad086abbb783d0c455b147267567b2eb1c7f28cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-151.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 3b25d7716eebc5ea520b9ec7187207161e7e1864..31ff10ce62d291c059430876c5435ebf34ca3720 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-152.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 367c0e2a0e4d1b4ccebafe5a4e8dde0f1ed1dd99..8cf6d8524701d73cbcd226c01d680060f9d868cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-153.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 3a8bd08c9d18044d91494d8a736cdd622f0af078..9943c51992981cf7d746c641abec1292407b7097 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-154.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index 8cd9703e3b3c8b5d15d085a95ddf20d461a51840..b0d1ea51d0cb8bd3346ab5fdcaa9b071cb4f233d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-155.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index 06ef5903b55c18850c1abd88f444444e0dfe7078..70395b47ee3a7f295950f8c6257a5c28d8777256 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-156.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index 5653d513b63e7622aeeea643f07113cbd4962f3a..b42435c376f09a22c7eb72e5d448d63286558f7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-157.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 940599207ee5ccd97c051a3879400028ff786ffd..8c36bad82edc97418e36d040d96c859e9203be76 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-158.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 68b48e3878df3c8fbff9aa50cf9ba1740aea4c57..7d01c6df5f9b0dc4cf25a21f889afe4d0df968a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-159.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index e37237da868315802c50667b1927cca6ac153daf..fee3f3166ca2ea966a7eebe8129e68de5e6d9304 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index cd194e93826d811ea6432189badd7664add7e09e..5578346448dd7ed553044cdde2fe0ac013248438 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-160.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index 52f5b3b1c32d60907b235fe998f4aae062bb4c7a..76f14cb41544d6fab605c12858af55cef8d1c8ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-161.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 6739f1e7eac5b1aa54bcf8fcdb0f6c3bcb6529e4..ebc6e357c5694147d5b1a792bdf8acbecca22fe8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-162.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index 6a5a45ff94ac05bc0b6d6eed3fea87a308ac99b1..6a5c5162225b78a66085654f7d560a2252bf6134 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-163.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index ca6ac68aa2ad2e1bc0420fd16a1270711ff6eba1..632d902a92587571da214d054c667f2517332140 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-164.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index 4953d91340f684dd2806a3ed80eba7975b359a77..35ecf5c86bc28a2bead1d32d3d1173b8da73ec60 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-165.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index 82bc6466c5cc2b0c0e170c5994686180dd68f91a..398bcda20727e610badf3baaea8b9cf22c29da9d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-166.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index e58d7e9466f67a4fae77c50177d39d096406f09a..71c6a7dc14b799f25e81ac468579fd6472053161 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-167.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index de1d618acdf2fae44f3a0ac3d4a4848969403a9d..b1cf3dbc79481791f8690cd83cc4e8680b41150c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-168.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index c63f1cbc517a82ee27bb751fbeec3b05990a93a3..7bdfaf5f65b28db8e2e9a365eeca430f985eaf17 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-169.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index 63462fbad914962e2adc5f5621b0a466efa7b274..1b82d06358d8c2fda8a9c874bf09c3a38d9e4d33 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index d3fbac3edac7f0ba3aec1f344e9e3c01a1d306c9..07533ad0587134d063fef9660a6deef0422bc222 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-170.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index f361349f68f451509cd9b5a0388af8a269bd5b9f..13f87c6e3f32271ec7d517ad273b021442c62d75 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-171.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index 4b5f4c95066a77dc14a0adca67803354329e8146..123fcc016ee83866488e1ab1579b84c7b8d4d1e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-172.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index 884df772af4173fbf0636c1ae2a7a1d1924496bb..8b6478ee0c02ce2c68509620ea99bf218aca2145 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-173.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index 36da65f65f0785c8436c706c8c0f5a0e84ae80a7..17a2e640a857322c0625f7d6718dbfb3154f36df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-174.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 3308d8d4767dfb911e848620970de66de1c37558..4e018a061d99ce0f77b2facb0495fe3fa545ad90 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-175.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index a58c7f76e3ac1fb5d7fbc6e71bfde2c4a3c2c612..4707d8bc8b8b8a82e6a589feaf6d2b896de9681d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-176.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index c8d9a3a8ca518f870bb31826ab62646fc61bbda4..99c77e8cb5f852b2ef483e7cd23b58a0b6b13d69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-177.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index a8a2395a5dced37c9b6fa45bc1e062ba96aeeba0..df7c172de644048d4b61ae40d6cccb72b62cd4a4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-178.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 03da3f1dafcefc2f468b7cf458a32d52e2605488..ffd13ff8eb18496943333ed4bd4031a38fa9fa14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-179.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 460f9e83bb687e0c626fc298c9ff497cda7fedf8..ac8a1572b8d18e967ba65f22f0aaa83375d4c996 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index c76871a7c873bc38a9d317c7d9b089de0eb3cd11..6990a8c84108c1aae47bf234f089b36b69ec2aa2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 493afae575c5c8c860aa55dc5bd7b11bcb943b10..c1a82c867f3caac96abe463dc6ca8d48e76eb709 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index f062468fc4336e777deafe31f1f59a7412e1a567..4ea2613907b20036fca4cf5416e79a230f8c6733 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index 1ca77ffe62b713819cddb7c3d4b49f86838418e8..c72d18477adf0dd59ddb731e3131c8688c26fc71 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 6fd4214eba48925eaf7af4e004913a0912cd959b..d33353676dd1661f49c8e63accfeda93765a3ec3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index 791fd1257216ffe9d7fe6a2ee1daf3a2d4569040..c69627da5b1e64572e3f3cc8d2ae9e071f75bc55 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index 62927e4da6b36b8a2f8ab22a9fcf98ef90c4cf9a..ea66352a80942864509f329f138b7c2a7dc5d007 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 6343f09a2aad8acd2ca4e7b2d89936a2cb826fdd..0ada4da9cf81456eb827d591f223c0bd3aaf5b74 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index 1408564fade9336803d7bcef92f5d499114c5a6a..219a70062357d8e61a0b5f1684b7f633e4a2ee62 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index d58790d63878a78e78f24ffa90087058110a7995..ea5184c26da6be090629e02e80de5db1267c1a28 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index e6e38f9087c65ad509a71564c7f419a861439184..9e1d767227a0a1c2fbcda7877658449bc3379431 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 48300ab301e6954c08d8f90955604b2e5f91d792..51543d76d52d7d6de121cb6e6b3d196a80c3f8f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index 96c68ddb24939d7733c9a6808600080210705d45..49b00c09a6b71a8f4e76afeec8f0ec784a126c16 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index 728541d4f1726237389567f562efd4838ba38546..4a8e6739644d185cc38a78b8b5d224b74732cf8a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index 4060323f192b62e803c58a524bce413083a206d3..f1d697816f5396c9ad4b5b7e5418e96e9743f48b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index e14cc83cb197a2e78d412c665cc4b2c2b01efdee..95e39b8ce4f6552eb2acc111024bc8425a2736b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index e116a6c475ebe83f07f83b283950bb3be9cd42a0..5c0af442d8a98d7c3423641b43e163e933dca570 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index e697e7af2a3e14a46667c79dec01f091d6830bd3..240a0f4dd62ff1cbf956083bcb6402d5a74f3421 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index b24c66d41d4a4a381408e2335766f42394468401..5a47976ee51147de6cf61fc12a80550de2d70882 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 344fc0d62196e7310549da70e12d18a1a1513530..837cfed3baac03e60a90c8ade11905c92cc042e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index 497929742f2452fc4862e832f23dd20fec0fd98c..99756b4761de7514cb9e394e91627a2963b2459b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 2bfac52f0f3321381401524005c4f6e72b9b0008..685fd82ee070476420dee90dba163a21bb0ca10d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index dad113697fcd5f87129480d454bb4942b04e54ee..604574ed75edddea945f9a3f63ff09fcdaf4cc69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index 6eda096952a70a8e20a13e9ad9a73bc0e6f5e792..3535c3d1332201c1432598268704a15df82d7cc0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index 7d95182a2700d84edda540b7e4126af2bc0db89c..764409fdda2cb1318043652add7e4f5a19f221ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index 7c24a0393f23d1fd7cfd78c3f1dcfb0b4d04aaf4..fdf3446d39681348fe8f5c767be74a1b88138da6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index cb8cd46b2c246a479039c7854052b7e31a484a76..617e65e847b1d6baa4534bea0184e194ff66840c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 8ab02e5533791be57094802607ac97e4f2f2962d..5b481944ce54ec18b7555c82460d2b8ca6ca2353 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index 842ef7c7b9bb4eb096059183fe7b47d51c53928e..e69bb1a830b8250b03f3b2eaf5b435664848d966 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index 3b7ad57f7c20137031fca942df36e42d39159485..c4182ae865e20486a3a3f81bfff83911978cbb42 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index d06bdfbc503454c2e5ef4c9e38a17379212de29c..b054f0058860d7c8a26014bc49b5ff5236f10914 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index adc447bb777209fdcf38e54198003546e83ff308..2c179e751168ff31e15537329c0ba50cc2f42906 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index 418e8c21588175b56381e56f0f1015cb6cd5a848..a1bb96eeeb3733b6d550607052cbaf6262116c03 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 9c8b88eb5860a7b32b392875ff413bb5b9409d42..d4d0d92a9f15a7e62c0b5a3def787c6eb00d3ece 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 3a997d6bcb4725ea7111718c5914608a9a9520dc..bc43a884e17e9b39459892e17c1e2ad02084ca7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 9d0ae6dff555bc14ca398faace3e66bf40c55804..79d2af66c214391c6f9006aa62f4df68c631fa47 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index 0285fa2901de39e8dd0ddf1f627d95e5e3a5a795..36fc4d2e56022475ca898a0836e4fa340ec656ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index 8fdd63dfe811d8ffd31aefd62a2bb5a1c2c969b1..667556b1a830787f2764b2e7e1f924e3afe3f07b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index ccb8faa12212f132b0c23413f5e31814c4f138ce..7475f19e4e4b303995c559f78a0db9a23c250544 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index 51f89af3bd9929e3bd94c17393797349ff08cec2..527feead8aad48c59152f77f0d8cdd8f9ea88502 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index cbbbffad5cf7ae35b06a91c066f7ac383a8bfa6e..8fe4640700c1249f4ff0d1914ecdf3cbaacf8c04 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index 121ee522fa8f6deeccad6ce1b3709116a5af7193..3c903d9c6d474b2d634a1db57256d2a00d3c29b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index 2e1dc3d868482f37e7b8a9c9e938c538625a8ea3..c27f3494ac20b0f028a23133012254528f593d3b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 5f7c5aa287090762a89dcfcb3d893cca7af8080f..c4af088634d2fa81a384f6cf7a438450415da46c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index fcbfd1d2f8077099fc44f92472f0d4920c115461..1071f56948bf81343d51cc143fba98338abe42f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 6362f046b311f95ec8a20eb077cf4e528ea9f269..1a6a410099e51aac45edb3127c44d538f400aa6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index 7914d5c892eae0cdbd3c64b50f568b3295d86196..d3710f9a82b483a1c3bf12a6b77c38aeefdd59d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index d1c3e9e093ce5cbd5f299638754b4d2f70caf220..27525ca0b0ab742c7f628a378f9f1689853fa87a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index d4242ee97e04496447c816d323a9de6e6faf22c5..112b28901655a0cdb500533e88eb7bf6e756179d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index a593d6592338eda44b994edc8be041113c230ca0..8f8d2f0644f1716683f7f2528630d6c7becb4c6e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index c7bb8e6eab6f17682297f2a06e6767ce0f23c7f6..c5d8c0ff74e472b6191204249eea5d8526d14946 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 125c24120799fe1d867ddb17b04e3d18095b9a34..365ca1c58fc4c6249e73f96123de3368ecda920a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index 4409f4b5bc6d79fa1da0399d27a95ac2e00fde01..27c8858df1a20d2557665cb6b5c2dcb2591eba68 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 2b32c07f02f776abb14619b4b9879b23050b12ec..7e4e83fff39bea119e6afcfb1b737b162236ffe4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 5fefe8cc9fda31a9ed9603d71cb59bbad6b22654..88e95d9fb575922cb077bc79dec65e011cc7ae0a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 12a0409633617ae35777f041b4e4d95c28f714d9..ce2a8a2ae995874ffb4b60064d682416193d1f13 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index c59905e156dce5c3ee3396dc6adbc68488357418..6edc97c922454ff26b2abe992912bb7eacb99a8d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 99f7b3d2d437e2335222382ad8126c53862801e7..ff4b836ecc2570903e887de68f6f7bd5f9c9f2fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index 4a46c59004bf78248405ceebaac098d8ab5c8085..4425ee81b295fa4b68a00dd96b9b45ff67d4eb14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index 3bd42bd10079f0406ae16779d68230d4d4d42aea..ca1d7265b64fbd4aa03fe0d8f7799dfbac760746 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 545d3867bf12a8d3fe185d00e7c1b41fb58fdb7e..6fe5d809ac0d256ad1cfec9eae137d2d48005a07 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index 6b7c7717495fe67e511413e3ead198d425d33c2c..251996b90ea2d7373e29be845f437c08124f16c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index f53cc2e8bd594eb5fb25d9d7f3d616db9543430e..9c2922802bb42360fecb29925607431930eee3d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 36aba88a53da02e71a06eedf89762f2db1f7509a..e4385c2209f80db9cd23d25f49272f8e77326777 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index 50f9f5646e57b81713fc251b3934e9921b6d07f6..cce8def17bac139f856a6960fea28e649d70896a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index cf7f340e87df8409533d0bd0ac6c2c1b2eca47b2..49fc1ea1b57c5c70356d010422fd292101ce7332 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index 33e9fd9f2429c8363c7bc6d9627a478cf1524fe1..7c50e6ab299a0e7ad2db6da875aa0254a3caa474 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index 3b20a4ec517d04aff519c8b1871d5b3586cae17e..9253ea21bcc8f09c857063c93de739362a04a75a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 977025280edf1d434c04f690d4e34cab6aaf4ba4..5ed65c0c90dac8440efc4ee862695386829008e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 2935a766184266ae67804b1bc75936c6147b9b63..a26e6dacf01712f532492c0e24015012b01a24e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index e79d48b647ef9346ea6a85f8dbe2f9c23f070bae..ab4d4a6bafc33ef9ca6d12e84fe724105bebacb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index 7663e7c6025132bf8b23844145f63f6f39df3629..87a447d69f92567b8042a0d53fea0c8be0676350 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index 743e859a0855a2476259730306667cc708098502..fa458b27b77c843850f5e74f020390df7efb8dba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index b85c0c21dd50be15615bb73d8ca7beeb7b9c06d9..262e7e16bfe30c250929c352272d238a4adaa7a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 892bfbc661847ee2805d5be0bc1ee2448686f413..74786e65c958b70778ad45391e6816d81d717243 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index 2e61fbba09bad7bf71f548accd356edc557e2df3..3118dc6ae9c1e7b175e59a4d077886eaa09a2189 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 4c5fc0c0ac471355e60cc1bb6b130572c6764f56..5b2763b09cfe75845327f229e0931edf93460f85 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 9beec88a21f114bd307d9e9e31a05c04c532ce8d..2aaa31ca24c949a03d6ae7fab34143e82715971b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index f86efa42a59967038e743ecad49fd6045e2b7c04..bca3795ba1c4870048ae31c4ab355637dcb901f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 7e60a1a372c8c88631085e3e9528bfd605fc68b9..5137d24a7418e7a2cd0d4d4408a0c2aee2db352b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index bb4f75d600868b265d51d9f7bb0233889f56b973..16bcfd7135fbdb94ce70363bc5848fe09e640f52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 13d0d3c0dc6f9c527cc4216bdd42b885d5fb2dc7..28f5ff85d34f022ae9dfad5b8a2f847902150cce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-253.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index 8f01bac5d98df3b541ac93ff455d79dbd4a0c9d3..195badb7279506105d8d55ccb10c9672b5523e49 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-254.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 87d7a97c998e19118d0c5d8019eccf5ada17d754..ee84a7c059c60f85b27a9ede08c2876e18845939 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-255.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index 418f82a82da57a0bbcce0e7a49d853da839c14f9..bbef8cd1107780f3234407081d097b8cd48e310a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-256.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 4364b077496e98c70557988d887717fed302a646..9da8f1982115fd5b5da87855e4b3fce24e8072b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-257.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 3720b00477dccfe76269d89513c40bae5a664448..7b96e9783d02217db92481bcc636b0090425020b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-258.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 470dbfee8aefae225d3ed6d1c06a7344926c1a63..90d5855430b80eaf6c795a04957f93ff427bfdc6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-259.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 5ff4d58f7bbabc23b638c27f097dd8d3974cec64..0565234092875df86251aac4d77953ed04a8abdf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 39601a07b00d27d5affcc45e89967834162d0c30..6023f0fd313f3908ba31f82de34b80884265a10e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-260.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index dbc5a67b1a9f2216ee75eb2e0e05464aff4eded9..360e0501221e4740fc271374841f2fb7a519ce36 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-261.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index 78ded744270a770ce02ed3cbdf465caf9aadb08d..971f0ada09004df3ecbb9ad6225a4a54287ff78f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-262.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index e44e1b6839d2c6a4793ace9142dceb9e3faaccf6..e2f680375b0131bc23999807d9c06871f82a409a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-263.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index ab26769c96fc8dcf8b74c1f4c90cad99e9066c10..4a456c7d819cf04f3527aca035fe1f1e7f2a8224 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-264.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index d0e6af9d44c6c272d67c63392a13e2b81cb42c93..c4c38390c4d04556aceb0781697202e72153a31b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-265.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 79067d3465384d653c700409f0ded7aca01a76bb..068aa3f60e28a92592ed880f047fc9732d20edd7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-266.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index c711053be891fd2a62d0d6c9918f0777fb4be6b1..24128a6a7e94f68e915a12ba67634d0672887ff8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -24,9 +24,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-267.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index 1a4927b7b0d7d8d17ff9f3667f218928f86207dd..32ee03feb336252591714e0c975627a93413d7b1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-268.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index ae13c7b0a26ee17567fabf0dcf1053459c6350ca..bffd39aa33118f683108093bb4b93216859a1f12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-269.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index 441b08d6b82054beea3010fc64aad67893730d75..000602ccc395f5dde4405180b2c6bc22f5fc93f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index d7dd511756941d9f1e09585fbf129a70508e0671..fc7a98d370453ed9a3666d8bc61acd3faf67b400 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-270.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index 7bdc90d862ea00deb0bfd7fb775cde4bf289904c..09164d03f025437edfb1ea98e493677c88428875 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-271.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index a4642ad2e6a657d0ebe03479ae0f3a70f00e9bae..04d60dd7f6e19c255f2bfe90c94c9a6938d34f7e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-272.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index 5c83d35c79245c796afe122de138896faa7d5d7e..e6eea3c7b15019d5570193109c372e3c97a3b9fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-273.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index ad3e728b99934d2263ef18a7fcf07e2001e0a254..de11abe28cd6c7ad6b6f4607298322678fa8873d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-274.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 61c9e84bd36613863c861bf1f585e5e2a653ce55..d305a231d236f8223faee202c7b9184c430f9a37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-275.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index e756be1c0876f5a066362f822da9e0fb295f5d19..fcc470d2fade21e6fdd4bdd5e1e5b9a965cdabf1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-276.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index 54085d9153e2b1250126af5b2a0949b45d942f19..c851eda5811c2bf1d1e407f37ba8ce231e1f706f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-277.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index 51f1ee0c72807430f5990c308af4196601552010..dc07665a21ff1e1f26d71abb44fa1abe6e7f331f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-278.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index 2862d85d1b12d39a303ea05d20b1928917fb31e6..40d43e436166a8e308d27f197771665b35b57c09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-279.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index bd4850cc5278ff0d2d4caf99c92d58e9dfdb53df..bc59c99347c358a765e25048f0a8f9a72046c16a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index 797338c2e7cfd27640a6220a3d0c3ea60cf99d7a..ff6a6b33965409aca5ec13762314b5f965526669 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-280.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index f750d4ac22b8a578580d2a9bf3a50324009fbf67..809ce4dde882a5362ceb9bae2bf0c4af87e32c80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-281.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index 59028e0d58dc78c417f4da22406d184ef6d08c35..fbace3bf0723076b998fa28f6c3474b141094021 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-282.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index b218842baf09b347847d31fe50bdf26370238f13..7408bfc9ce75de546216844a0365e791ca4d445c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-283.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index c14528b8c6690a671d99dc3b6bc4971503702eaf..e401ed19629fffb0c893aa6394331d527622e7f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-284.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index de23dda876d8f2c4f5dde83499c45cec4a7fc8ee..5aee2bc8a4b8fa49a478e49d21267504a62dff05 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-285.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index c36295e23bf45eb3ccdbc1cbdc8b9286f3a9fbba..7f98329c0d2c7d0579f5c52f5d82d2116805f8f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-286.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index a352271641e84ec38f0320bf51963ea9d3e881f2..d29b0e132dfb05b65fabcf53cdbc6ccafc1efd86 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-287.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index 609e2575db30b1ca8b4b45f9c3b487b4238de702..6c7ee9e9ef8d4a35ff1a4a5a95762e3f92a47ff2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-288.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index a75409f51151e7113e47db7209a9afdbb70c546e..cb9946ff4d18d302285510a9a2e8aaab183bb3aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-289.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index 34e7f510e3cd2257e0362f706b33a5fa10a089df..b816f2cbd01dd727c3a3380722417f68108fcc3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 1920e0b518b898c58c0670c31c59c10b091a3b82..3f2ea6e18506c444eacde647ef216e8a86625011 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-290.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 66464f0c23e3451c8a56d29983cb47abf2106a8c..d37d251e99f2cf5c7cd913ff63c82b702ef922d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-291.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 0a38a464a79caf23a3f84d4ecd6875d7da30da7b..a3c171baf4064a1f7cb018ac792e4fb908c4ee7b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-292.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index dfdc964e42b43c4948b468a383d2b27fda69464c..4ab7fe07a1c31c8e22f34482356b1df660770637 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-293.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index bddd6b085c276f20e4304a7bca8a2eff29a2ba4a..9dcd73b849938580467fae447df1b0cdf8423931 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-294.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index f0fba6501db63639e87d2823b1a40e758878abfe..adc20937266ce0c0bf44aa751f3d5183baeb7241 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-295.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 5d7e37b000c81becf5d0dfa9a4bf7540860f1ab8..e87a4285903608dbf49976139b9ff7bb6c9bf4cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-296.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index dd2da33c8f35168ea9ebdbb3f15e57c64f16d3ed..004950f348b16d8713a2dceaf0cf57bd3e878b59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-297.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 830fd1af6ade576998a4b33b952bd599c11b03f5..83445d707b1c65acce443801066979e619ff781a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-298.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 26640e87beb17126ba49f0b1401ca7717e9769a4..bcea7b3df4eb63389d27f538ac378b54ab463a32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-299.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index 20e0da38b61f64b613ec9b02b1071dc48cdc7964..a0af25796e36c4fd6beac0ce803e0132eb2160f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index 8fdeb0ab6a1e5c12b97c7caa6403cdf2d61fda86..20b950722954d2df6c7b8d0982960df997e13665 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index f311f303984a1c15094132612411fe152f345fc0..fff89a2aef089f454a7b4a5c7471a93df80ce1bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-300.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 4b5835758a536590a8a5887f583aab8f71719316..9df39cc9371189b31b46ad675446fe351565204b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-301.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index eae99672ffa6e9d242c160e7ef55c7b0158b9693..9f6667891b76b36a28ac82b4d7f7946601ca022c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-302.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index 246bc16e5055d5ca26428c649468711f9452c9fc..1366997765cf32014c276b58f08a1ff6d9c9b745 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-303.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 0a8405e3a161b66270d83a869f707105952a000a..8223143ac59b80103eb890a0d9e7349109d64ddd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-304.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 6e19d1b6f22eaf5ee4bff07e7299be5073c8e461..68684ccc37d896559cdd4605805c9460c1c04fa3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-305.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index adbb08b2f0b36e881b8273141d6a2ef2f0961e91..e09f056b8e956c57c8d07e6abfa1103e10aa9601 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index a396754520d6bf4f7445673d8af40d0149b22ec9..8e98ac1ff460d0fda493f9d8445eaade1e3f343d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index ae926dd712af54338bf05427c3474236f42f2dc6..59c1d5306eff313117b14be4f0d74b45b28e4bae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index b40649430b4d75b44f91086781e2de44b1a3523c..25a14baa25415d980e19f2452872bf69766c8bf9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index 97ffea26dc9e49c38e45d8788edbe60d92b4b902..8a04473da8583713e238bcd3d435ce86f07d6d11 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-31.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 516afa61341bf1bd332bb879e1b315e46711f6d5..9d84177052d79b02bcf011257d4742e763126f84 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index a611a8fa849e3cfc785a6d76f404c68566692278..9c93731266c259060685e1a280eed58bc9dd90c2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-32.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index d581d2e9918092a3e18b390f2dafa18e56aeb921..89e5e3ddf9c7eb7c9ad12d77b5089dbe7cc55307 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-33.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index cbd8013802b72667d27646755bdcfa4667469b3d..0b52c7decab311a45885f1451f4b22ba27fe1fd9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-34.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 5573a1ab9acc75b91cad86398e8160ab98b4da37..88da272bd992ae8da7909d9022ae3b140b74dedc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-35.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index e1712aadf94f071820b819c9585cc15fd125c68c..2de9d18c257d0c0af7aae9c124625dea983ee55e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-36.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index 32043b470514329ddc04558a375c2db848e710ef..5d03b84e6e526d00d128e76d24146b2576dd7358 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-37.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index e75e91c6c2d766b7d97cfe38c07edd27de901394..f9ed5b248f5c8d3088012880ca17ebbb2f6b6e83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-38.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index 3666630e099e986e114a9c49abe4e999111aedfb..125b1ba169079fa91d5e463202e9892a344c88aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-39.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index a5449c7c26f7dbe0d6504db2c40caf3ebf6ffba2..b139781bd9337f06fc55193c36a530aabddf1968 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index 6c3f4ed90a52d48538c0f952f7624996395f809d..99940d2f0bd7bc38b51c1512292c81db983f5ae7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-40.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 4f258e2e463cc57cbcc7656f4c3477ed1e8f6fb5..781246b93c4a983fcf2cf8052875aa507e4a0832 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-41.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index 15108d2795ef4589eec797ac31ddc0634a93419f..7c2a8509bd99eefce230e0fb3da83b9006c9006a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-42.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index 5f70e008a09c1c9013e465b19962e90d9fce3583..113b4853e8da3ada019ffe1bd3c74b2cd74a91df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-43.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index 427a0204802ed6448ac73fa4e463837286754d5a..11ed16f6c436f9167b9e589e834c710f80d1ced8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-44.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index bf73fb9bbecf52cf7190434a8bd34fcc9f0837ef..6fcfaf4d4d2d717309eaf3309f2aae014241354c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-45.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index 12c197e2e02eae5520a00eee4bccfb34940a7fae..d493bc0bd7283b9d5e91135b2ec194b50ded9039 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-46.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 25228f7ad7dd1ad7b7c35876980e312c1c9ba539..20fab3551d0162665913c71bb01fbce0222f6f22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-47.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index f3758a9c1f5138e88f94056aadd38bb7d88d25a5..604b5cc297b8dadabff48ba82d567502c87cd458 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-48.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 22f3d029667a80b1cd118c228ddc0edad04386ca..2663d542f14f6d6c115dbffb1bad4200ace9aa3e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-49.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index db571cb7812b03e9913244b1530eb61c9411b76a..a190c0c9a62d67993f4c26602e22209480d18c0f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index ad2d43b6c531e14538f54f515989dda2e513974b..0acaf22186039d460d6520597c8262b342aadec9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-50.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 02d2014e13856970ceff0df727bb53ec03dc6648..a50f656da1f4b4f41922b3befa3a810f1a87a4a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-51.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 167dd96e5416c0f75ad21049d41abdece71f281e..62ca6093bbf312419bb02df201eb53aa92d041ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-52.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index b2f740109eb5c4bb08014694b8ecb18b0150bb1b..55424256d83e07111c672137aaa644fd0503a1f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-53.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index 907f4e0a1d58736cf9e6f14cea4885b6e6a5423a..29da2df9d76ff2b94b49520819cdef2fe8122944 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-54.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index 3596cda7e82706cd6713707c65137896350ac9be..3c636c92205c4a4863f42dca40f07ab9e41781fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-55.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index 5526fe443a49c857478b94bc6b9d44984a35cb32..d6b3e86d61e553368c1ff0abe4fde00d95439f74 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-56.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index 9f9965440165a3cca3d054b0058143297adc8473..a7ff27b347bf648cf23d192517c237de28022ca6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-57.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index fd06f11588462900c0915a19a844432f7a67674c..1ec773c2859b142eee5c70a80b928049ff93272c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-58.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 2e536d32370db83aacd9633f65cdba7a8dcd1840..89eb6e6bd92512eef3a7610446b80dec4c317b88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-59.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 427d5be2b728cd49f9f308a54aa217b9d40322e9..80b50b532da23f3bed05397e7e0828f29ba7a064 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index eadf52ae9d8ca669e99a0267eb4e18b9334ff1b2..aa3973804d18fa25d153b3735d679fafd698a01d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-60.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index 127c664f8e29f26a0378ee43ac4244c5c2ecddfa..a409b5f1716e1cd6eac68de3aca6eab760e79245 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-61.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index 31e441c45524bd27238b838eb7bc05fb971f4c48..cd6c58588537c64ec23de7157b7ff32518ce0c6c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-62.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index a094958df31132f923ac4baea305dcb7bc430e63..9f6dae77cb7560e7d0c8f3fac90c9921322bc1e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-63.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index 29f31c10a1f9052479112b2e373990dc82058c00..9c50098ec4c5af1be6778540722e99db4d78dfa2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-64.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index 36f6c5129033b67cd226b97e9d9961ade05eebe0..5b0234c166bb1df8cf6fd2d1c041157541bf77ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-65.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index 7217865c92d090890dd0cf55f983ffbfa49b531c..10e07f44baaa1b8e79d1bea4d32caf5b53b424e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-66.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index 5ce55978a69f9a67f2b782d9f9e523ac7f47f2a3..74de375aa9d4f91939984c07b289d3013d8c0f2c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-67.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index daee86ecbfbd2f8a76fdf9bcfefcd4b07d5a8859..53ba3c3c3ba2af62bd8e4dfb01a0e012630e2158 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-68.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index 0d1413297ce4f01144b02e89f67eb568e3828bf4..67928bf18aa66d5d49b0ee03096fe1424d82a40a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-69.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index c96f78e11f954916916f9d7d33d800250741942d..7f6d8fad2683b1e9df832ab07327e871305c7ce4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index 3c3f54381176349156e28dcb746be7943069b614..f54c4a03964c50ba4b1b030118d0580da5e0d834 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-70.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 7bec4871b570117d212ce7b1ddb60575d6c51152..eb4de57601da8e6e29747facf3cefe02f2f78e1c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-71.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 082d2849de15ad6250a26421adb4d2d21d895f07..4ec1ed5ebc5f4670295a62dd80dd9c1968c067d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-72.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index d61a5633a4970bd7229e6d8912a5f3a9e26581ea..a3fded488714b9b4e7adfbdf1dec06f492cb0a57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-73.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 83574365b08e5e9ef982d79cd0f6c0d82b70dcca..6c73b379c9f4b119cc0592be7e6f0a45cb67b8d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-74.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index a7756b7c56e6b11ff3973277541329ceced1980a..71b46239b4e29d821cd71b129626cfab3a018731 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-75.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index 8a59a3b55b401ec95b5ee03a526c64a0accb48ad..03693aae12a5f148f4da2b6e180341c1bab63b19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-76.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 9c22a1067d197214bc0ce3cd27a2ad5b23d27d85..8a25ee14be36b6d94cbb1ede60660c9e0716cf08 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-77.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index 7c24240f963b027835fe8bdd99837690b3f90e47..d5d8c1f5e37d1e92d8172b6eb61a88bea7723290 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-78.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index a4cd43cbdafe7c77c4e045be28899d1e60841bf5..a4c4dcd3321616d263f67491464ad37bda5ee5c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-79.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index e4a7a650fbf9affde142d6b0a21752c96f4598ce..7e712f87bdde6991c9fcf1273d3614be477432a6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index c9b7a07980e1fd0261b1e1efdaea8dde8a6098c7..0bd708afa09c2a86951de45025069a3f54d325ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-80.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index 346734acd340ba936aa6b6aaa2dd3df66796d0c7..bdc39bca6b6b23445772c8f0785b1357ba906df8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-81.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index f63831e0b0c455d8f69a1020c8f2f8eba72e3680..f32b67df8906ad5ec166abd44133a914e5f55bcb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-82.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index 5f6ab9308c53317920909387d7e0ddcd564248bb..5cf7d9b04d2a1fb5de014610930df416f7bbfe58 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-83.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 1ede60d8550986fc822afe9a5efc12943c15f6e7..731ba33866294eb9d6f06ed984a128e66475f800 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-84.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 173c60392ea676e7ff4702b634696761bb64f6a7..9bc94343a4897e4fe088af310067479ed91a688b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-85.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index b328d123d7b238ace11dc000b4f37986549c6b5c..ac82c6e88b6441c40c09f928fcd90616ab1032d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-86.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index 5575dd3af79c11c8a9a368d289b3e890b61366db..8ad2039d933e883475e8bba107ce14c2109e3526 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-87.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 6338dd4f9369ab48b1d3860820b2fb488863aa36..7342e611fd5f2e7cc93d39cc38959d2fa0c62d8a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-88.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 038f217563d24448b40f399c5bb6b81829a60ea9..25579610b9d3292054278613979c30dd355c9403 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-89.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index ece40e7b83e432839f37c1ecef13d57aaf9fff00..6e5e3b1dd765a2efac04311e175f9d82796703bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index bf27655b4891ec4c148ceccb45e5ce8f1d099ab0..cbc9c30bc7bf73635c3423840e57994642a12578 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-90.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index 271d393da8b5f50044cbd8df02beb84c2ac6b382..d3bdbe379523098d74e1c914c8a2ab039db97f61 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-91.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index f534f2badec37b9778268711044e8aba671b149e..2217bc7d1bd62a80ce3055a420dd98a12d448f10 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-92.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -86,10 +86,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index 091a787d66261b99899cdeddc1c6725e31f61e41..8830487496fca3801fe34a146bf9b91ff6908688 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-93.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index bc397fa204cf43ed1bd24fe25aa086b7c4db7a1a..a063ab751dfb37e55eabeb0252244d7b3bedff02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-94.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index 24023adb543f14e24d1c062cd1d6b0ac15832397..aa70a2676939f0fa35a9bda6fcb42451d979e2f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-95.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index 04b805f6d802258bcd376e55caec2a61fe3216ad..0dea2a46b3ffae5d8c794b29dad878a6c4cd80f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-96.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index c4709c2051949665c22bcfe47aa735f29febcb86..ccbd1ca98cc1fb9dbe846f11000616188acc4e32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-97.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index 28e2c75266101e341485e47d396c2b0c5d22b06b..12586fd57254e78d48b8def0a4fa0c3e10861477 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-98.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index 2e9cb0d3b6d7ce90b0c656e03230161531483b2c..c448c08385bef325bcf7a79365ba08be81aa051a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-99.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -87,10 +87,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index 85ff128ff70570653338e77c016de587e8088b17..4e96b2f3c58f980336a8689b73ae1199bcc2ade3 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-1-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index 90be6c337eb75b969b1bb33993a1e49d233d043d..fddbeb2f99d51cf0db336b915609eabfd4b1da73 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-10-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index a5eac58633d221dce0711ccd702392d05aa87a3a..2b4831312e4f72e772fd427924a1931140d479b0 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-11-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index d78dc843517bf4da62fa365097866b132b7e5dfc..3ba99fa4b0754b585e9f14e1fd48aac950c2b9f3 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-12-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index b127f149fbaf5d472cdd622fca223ee9ddec5d16..7f58910360f079aa95d299365fb2e9b5718cc986 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-13-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index e2c0cd869203a1754556cf8e44d43617ed0f48c8..0cdb0a132d95bf1a295c76251c58a1065f158649 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-14-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index ae4c9446c3296c6fd6e9603e6ca88d5c87bee777..03c5983098d3715a2213291d2632334097f29e7c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-15-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index 8d31f7813e5276035b0c8b467f13dfe05ffe92ac..15c298f6032a7b4bc2b4df3b8633e9f96ac4389a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-16-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index 3a0c85a3b0d106a13eb19bfff8e9af4dc82ab062..ff8cd0b2c1819a0f630140730c850a17d6003fbb 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-17-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 5b047faa60015348d90ee044303e48242158143d..5632efd42b1e426af863942343cb84f4ab01b368 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-18-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index eecb0dda2aaec7fba3dd3cf93e9c2c5c2c5e8c71..91981d04e2d832643ae091638c7b9948ed99c35f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-19-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index 6768dd55be40157ae71c33a5f7089ce62f0ca48e..354b0157ed68c6b0195a55b8375a4d5ad12e2e82 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-2-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index feb96d24dc94f4041ad35df3fda2349ca22dd3af..e3fc6b3aee3d14a51b8e3291a342a68d3120ace2 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-20-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index f26e906e643ff0ca6fedfa206f79bffeacb59120..09c0c7d91ff6e7bb9dee73b9f455ba647058422b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-21-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index abae48c3c8049ae0935f3a7eee69681f7af7b1fa..1cbbe7edf99200ee38c6f559de1722201022ad4b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-22-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index 8966d611107545e1b640dac53e2c9d00af434f52..bd4a2273a4a02e110780481ba4f5a527db06fa35 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-23-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index 61d98e1904988ef5ddc422199b3affba2f9a616f..5e1b442bf620ec1b6f3008e3241b5c798b28f5db 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-24-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 8626503b1847e7c4e8d755711dbf2129110708d7..8110c70b26d310e1c5075d366340da2ae072472f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-25-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index 655d35588727db8197d1b877d1a00b990587865b..b46fb1bca8591c8fc11b747ecb0d5792ac27ee4b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-26-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index 17012e3e0d9a39e19d1c1a4e1aeac61be0411834..cd70f09cc6bd53ca83e0a4a17b16abf3899e8109 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -23,10 +23,10 @@
       "network_address": "netgdx-27-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "netgdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -62,7 +62,7 @@
       "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -80,17 +80,17 @@
       "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index 1395cf95b45d6a067f75bb6c2e8d02c82d88f76e..12c589751a5b14a28846e79f3431ee59f81c8edd 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-28-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index 4526d687e8298feaa58ad1880217a7c6eaae8548..87f50a1415f914638b013d4a20b9698960f4042f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-29-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 6a2e95e43f8073f4e8ba05c14d1233888f6ac3bc..c55c907b82f8da6061e009d18f8da162ce2a656a 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-3-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 3842d34fd15473a210e97b32c87dbfa94e236578..5066d57469e0327dff0f25f72a74a816d2ecd8f6 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-30-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index 857be473893c2e2cd3de7d3cdac69c060d6805e4..244b1b881a25d7f366ece6d968a7952347aeea75 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-4-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index daf95231731b64d289d5b7989ab6768acfede0cc..7021517e007a4198770cda5a33c65d8058073d5d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-5-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index 2446f1dd0b4956debe87b177b55dfc5cee1a2b17..85bd603fb2b45b1c47b779d8a72aa12337ef993d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-6-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 26e417e5c5dde4ffe962f4d19127f27e8fe39f8c..17acd52849129498e39c03eae363ee37a98a200d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-7-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index bda2c01795565372732ca8c659c98a20d203329a..e9c27ac9349511f1db0c65489fb9ef7c01e9c5f1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-8-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 60400585dc93d5bffdf51d7413810dc9cbda02c1..a83dd7395179e65340d27cdb8d9749b69047f950 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-9-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,17 +79,17 @@
       "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "kernel": "2.6.26",
-    "name": "debian-x64-5-prod",
-    "release": "5.1.2",
-    "version": "5"
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "6.0",
+    "version": "1.0"
   },
   "processor": {
     "cache_l1": null,
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
index 84a7d736b1f8df183a4c0f1e8e10ec40cf4748a5..a7178b5f84bda1e0bbeea1e8e60c07dcc48b5b24 100644
--- a/generators/input/orsay-links.yaml
+++ b/generators/input/orsay-links.yaml
@@ -13,7 +13,7 @@ switch-to-switch:
       - netgear10:
           width: 1
           nodes: "netgdx-1,30-bmc"
-      - mrv00:
+      - mrv10:
           width: 1
           nodes: "netgdx-1,30-rsa"
       - switch01: 
@@ -140,4 +140,4 @@ switch-to-switch:
             - mrv09: 
                 width: 1
                 nodes: "gdx-289,310-rsa"
-    
\ No newline at end of file
+    
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-switches.yaml
similarity index 69%
rename from generators/input/orsay-network.yaml
rename to generators/input/orsay-switches.yaml
index e290fbe9a0b4a37c7344689449482ebd17596c0b..c043ec32964cf6bdd4b83f9d40392831dcb6811e 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-switches.yaml
@@ -1,171 +1,171 @@
 --- 
-mrv01: 
-  mac: nil
+switch09: 
   rate: 1.G
-  ip: 172.26.120.201
+  mac: 00:12:01:72:CD:42
+  ip: 172.17.95.209
+netgear08: 
+  rate: 1.G
+  mac: 00:0F:B5:FC:0D:AA
+  ip: 172.17.95.228
 procurve09: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:B8:81
-  ip: 172.26.120.159
-netgear08: 
-  mac: 00:0F:B5:FC:0D:AA
-  rate: 1.G
-  ip: 172.26.120.158
-switch09: 
-  mac: 00:12:01:72:CD:42
-  rate: 1.G
-  ip: 172.26.120.109
-mrv02: 
-  mac: 00:A0:9C:00:16:41
+  ip: 172.17.95.229
+mrv01: 
   rate: 1.G
-  ip: 172.26.120.202
+  mac: 
+  ip: 172.17.95.231
 switch10: 
-  mac: 00:12:01:5B:AF:42
   rate: 1.G
-  ip: 172.26.120.110
-mrv03: 
-  mac: 00:A0:9C:00:12:DD
-  rate: 1.G
-  ip: 172.26.120.203
-netgear10: 
-  mac: 00:0F:B5:FC:0D:A8
+  mac: 00:12:01:5B:AF:42
+  ip: 172.17.95.210
+mrv02: 
   rate: 1.G
-  ip: 172.26.120.160
+  mac: 00:A0:9C:00:16:41
+  ip: 172.17.95.232
 switch11: 
-  mac: 00:11:BB:17:E8:C2
   rate: 1.G
-  ip: 172.26.120.111
-myri: 
-  mac: 00:60:DD:47:1E:66
-  rate: 10.G
-  ip: 172.26.121.100
-mrv04: 
-  mac: 00:A0:9C:00:12:E4
+  mac: 00:11:BB:17:E8:C2
+  ip: 172.17.95.211
+netgear10: 
   rate: 1.G
-  ip: 172.26.120.204
-switch12: 
-  mac: 00:12:00:4C:A7:C2
+  mac: 00:0F:B5:FC:0D:A8
+  ip: 172.17.95.230
+mrv03: 
   rate: 1.G
-  ip: 172.26.120.112
+  mac: 00:A0:9C:00:12:DD
+  ip: 172.17.95.233
 switch01: 
   rate-in: 1.G
   rate-out: 1.G
   mac: 00:12:01:73:27:C2
-  ip: 172.26.120.101
-mrv05: 
-  mac: 00:A0:9C:00:10:AE
-  rate: 1.G
-  ip: 172.26.120.205
-netgear01: 
-  mac: 00:0F:B5:FC:0D:26
-  rate: 1.G
-  ip: 172.26.120.151
-switch13: 
-  mac: 00:12:00:44:68:42
+  ip: 172.17.95.201
+switch12: 
   rate: 1.G
-  ip: 172.26.120.113
-switch02: 
-  mac: 00:12:01:73:21:C2
+  mac: 00:12:00:4C:A7:C2
+  ip: 172.17.95.212
+mrv04: 
   rate: 1.G
-  ip: 172.26.120.102
+  mac: 00:A0:9C:00:12:E4
+  ip: 172.17.95.234
+myri: 
+  rate: 10.G
+  mac: 00:60:DD:47:1E:66
+  ip: 172.18.95.254
 switch-nil: 
   rate-in: "0"
   rate-out: "0"
   mac: nil
   ip: nil
-cisco: 
-  mac: 00:11:5D:3D:50:00
-  ip: 172.26.120.100
-gw: 
-  mac: 00:11:5d:3d:50:00
+switch02: 
   rate: 1.G
-  ip: 172.24.120.10
-mrv06: 
-  mac: 00:A0:9C:00:16:42
+  mac: 00:12:01:73:21:C2
+  ip: 172.17.95.202
+switch13: 
   rate: 1.G
-  ip: 172.26.120.206
-netgear02: 
-  mac: 00:22:3F:E6:F8:CE
+  mac: 00:12:00:44:68:42
+  ip: 172.17.95.213
+netgear01: 
   rate: 1.G
-  ip: 172.26.120.152
-switch14: 
-  mac: 00:24:F9:2A:0E:41
+  mac: 00:0F:B5:FC:0D:26
+  ip: 172.17.95.221
+mrv05: 
   rate: 1.G
-  ip: 172.26.120.114
+  mac: 00:A0:9C:00:10:AE
+  ip: 172.17.95.235
 switch03: 
+  rate: 1.G
   mac: 00:24:F9:3E:81:42
+  ip: 172.17.95.203
+switch14: 
   rate: 1.G
-  ip: 172.26.120.103
-mrv07: 
-  mac: 00:A0:9C:00:25:84
+  mac: 00:24:F9:2A:0E:41
+  ip: 172.17.95.214
+netgear02: 
   rate: 1.G
-  ip: 172.26.120.207
-netgear03: 
-  mac: 00:0F:B5:FB:70:89
+  mac: 00:22:3F:E6:F8:CE
+  ip: 172.17.95.222
+mrv06: 
   rate: 1.G
-  ip: 172.26.120.153
+  mac: 00:A0:9C:00:16:42
+  ip: 172.17.95.236
+gw: 
+  rate: 1.G
+  mac: 00:11:5d:3d:50:00
+  ip: 172.16.95.254
+cisco: 
+  mac: 00:11:5D:3D:50:00
+  ip: 172.17.95.254
+switch04: 
+  rate: 1.G
+  mac: 00:11:BB:3E:FD:C2
+  ip: 172.17.95.204
 procurve15: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:6B:41
-  ip: 172.26.120.115
-switch04: 
-  mac: 00:11:BB:3E:FD:C2
+  ip: 172.17.95.215
+netgear03: 
   rate: 1.G
-  ip: 172.26.120.104
-mrv08: 
-  mac: nil
+  mac: 00:0F:B5:FB:70:89
+  ip: 172.17.95.223
+mrv07: 
   rate: 1.G
-  ip: 172.26.120.208
-netgear04: 
-  mac: 00:0F:B5:F5:79:2A
+  mac: 00:A0:9C:00:25:84
+  ip: 172.17.95.237
+switch05: 
   rate: 1.G
-  ip: 172.26.120.154
+  mac: 00:24:F9:3E:E7:42
+  ip: 172.17.95.205
 procurve16: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:0A:41
-  ip: 172.26.120.116
-switch05: 
-  mac: 00:24:F9:3E:E7:42
+  ip: 172.17.95.216
+netgear04: 
   rate: 1.G
-  ip: 172.26.120.105
-mrv09: 
-  mac: 00:A0:9C:00:25:4A
+  mac: 00:0F:B5:F5:79:2A
+  ip: 172.17.95.224
+mrv08: 
   rate: 1.G
-  ip: 172.26.120.209
-procurve06: 
-  rate-in: 100.M
-  rate-out: 1.G
-  mac: 00:18:FE::50:5B:41
-  ip: 172.26.120.156
-netgear05: 
-  mac: 00:0F:B5:FB:70:A5
+  mac: 
+  ip: 172.17.95.238
+switch06: 
   rate: 1.G
-  ip: 172.26.120.155
+  mac: "00:12:00:44:53:42"
+  ip: 172.17.95.206
 procurve17: 
   rate-in: 1.G
   rate-out: 1.G
   mac: 00:17:A4:80:81:80
-  ip: 172.26.120.117
-switch06: 
-  mac: "00:12:00:44:53:42"
+  ip: 172.17.95.217
+netgear05: 
   rate: 1.G
-  ip: 172.26.120.106
-switch07: 
-  mac: 00:24:F9:3E:A7:42
+  mac: 00:0F:B5:FB:70:A5
+  ip: 172.17.95.225
+procurve06: 
+  rate-in: 100.M
+  rate-out: 1.G
+  mac: 00:18:FE::50:5B:41
+  ip: 172.17.95.226
+mrv09: 
   rate: 1.G
-  ip: 172.26.120.107
-mrv00: 
-  mac: 00:A0:9C:00:12:FA
+  mac: 00:A0:9C:00:25:4A
+  ip: 172.17.95.239
+mrv10: 
   rate: 1.G
-  ip: 172.26.120.200
-netgear07: 
-  mac: 00:0F:B5:FC:0D:A5
+  mac: 00:A0:9C:00:12:FA
+  ip: 172.17.95.240
+switch07: 
   rate: 1.G
-  ip: 172.26.120.157
+  mac: 00:24:F9:3E:A7:42
+  ip: 172.17.95.207
 switch08: 
+  rate: 1.G
   mac: 00:12:00:4C:F5:C2
+  ip: 172.17.95.208
+netgear07: 
   rate: 1.G
-  ip: 172.26.120.108
+  mac: 00:0F:B5:FC:0D:A5
+  ip: 172.17.95.227
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index d56a9fb8e5a33e3ab0f30c942b8bc499983fa387..314725ac2b681e68d620b789e3017cc54561faa7 100644
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -30,8 +30,8 @@ end
 
 def update_switch(switches,iface,sw_name)
   unless switches.has_key? iface and switches[iface]["name"] == sw_name
-    sw = lookup('orsay-network',sw_name) 
-    fail "Switch '#{sw_name}' not found in 'orsay-network'" if sw.nil?
+    sw = lookup('orsay-switches',sw_name) 
+    fail "Switch '#{sw_name}' not found in 'orsay-switches'" if sw.nil?
     if sw["rate-in"].nil? 
       fail "Switch '#{sw_name}' input rate must be defined : 'rate' or 'rate-in'" if sw["rate"].nil?
       sw["rate-in"] = sw["rate"]
@@ -138,10 +138,10 @@ site :orsay do |site_uid|
           :virtual_size => nil
         })
         operating_system({
-          :name => "debian-x64-5-prod",
-          :release => "5.1.2",
-          :version => "5",
-          :kernel   => "2.6.26"
+          :name => "Debian",
+          :release => "6.0",
+          :version => "1.0",
+          :kernel   => "2.6.32"
         })
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
@@ -189,10 +189,10 @@ site :orsay do |site_uid|
           :virtual_size => nil
         })
         operating_system({
-          :name => "debian-x64-5-prod",
-          :release => "5.1.2",
-          :version => "5",
-          :kernel   => "2.6.26"
+          :name => "Debian",
+          :release => "6.0",
+          :version => "1.0",
+          :kernel   => "2.6.32"
         })
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}