diff --git a/data/grid5000/sites/nancy/clusters/graphene/graphene.json b/data/grid5000/sites/nancy/clusters/graphene/graphene.json
index 0e7473f64fa7024a75413fcfacd2cccc56d64044..b08a40754464d9f31548dcddd016ba8cc65edf3c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/graphene.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/graphene.json
@@ -1,5 +1,5 @@
 {
-  "created_at": "Thu, 20 Jan 2011 00:00:00 GMT",
+  "created_at": "Wed, 19 Jan 2011 23:00:00 GMT",
   "kavlan": true,
   "model": "Carri System 5393",
   "queues": [
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index 3d2aaa9fe0edb3e0cc94e0f8759fbb003600b97a..c5e276645a967a31132b1a4104de6c687e7f7cbb 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-1-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/3",
+      "switch_port": "Gi2/41",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 6529e8b1a59227059fb2b1648a91e8c37fb8b219..c1e3cd90934fc2e7ce0d91cd216095265e39d401 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-2-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/9",
+      "switch_port": "Gi2/42",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index fee8613900e9c63a2dc460a7fd83c02f95cec7bf..4626e5f029726ab2c022dbdcb2bc056e9047d2f5 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-3-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/3",
+      "switch_port": "Gi2/43",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index c7347c4cbbc7d36a9da67c35dbbf36f3e2211417..48129541e8d18e95db2bdd6da0aab81d6fe4df22 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-4-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/1",
+      "switch_port": "Gi2/44",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index 1c822ce4f9b5782ca5cf017f51259bf23632d5ef..d53c896ac3e7f8a3834514a18dee146160bc944d 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-5-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/7",
+      "switch_port": "Gi2/45",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index db75e4908ed7fb7a1db917febd4c5919a8a9058d..2686885fedf3095e56c66dceb7bc7e5ea6d43b07 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-6-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/10",
+      "switch_port": "Gi2/46",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index 2343c4574a6a3a1569b7b3b0f3cc1ef14ab54dcf..535f08c8370ae4993782eb58b3fa2ba2f9746b10 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-7-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/6",
+      "switch_port": "Gi2/47",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index 21ced2c53fe265dfc1cf30efe6f8f895101721be..9b9474622a172f02033db1afdec385b2d5d075d1 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -144,7 +144,7 @@
       "network_address": "paranoia-8-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/13",
+      "switch_port": "Gi2/48",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index 2a9df1b1ac8e29d463d42461202f69f422d64934..b128b72799031b6ad268da006c4fd1795f21bd8f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-10.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/31",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index ee10fc1028f1f7147aed3bfa9d78dbee62150769..2a69fd4ca16e394d4be47fb7954aef2968bfc66e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-11.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/40",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 4e1e1e0e562ddcb4ba51a71c16f808f7c9ed0439..228459c6df65ba262aaf18526a236ec61abf3620 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-12.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/41",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index 260069af18a3d7588fdf60cc8941fbeea644886b..5eddeab1cde52cd956a44a770e49c95640aaaba9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-13.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/37",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index ce8954e445b5c098bb90b872f83255f2322fa488..36dc946bf4cb5c4cde4432bf4c4b075574c5ac57 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-14.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/38",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 91f3a4c1b22ac9512f89eff782eeba6bef376ae1..fdffa0699faccfa27252b99aa9061bebd77ea567 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-15.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/39",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index aa21db35032ad5e7928ed2d41b3bd387d1d43dfa..9fcc006c0abd81fb362f791358e9b4879d30cf6b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-16.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/44",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index d94e518205e6072c2a022fadae1a11a57b13e11d..4f754e72bcb9648964a974f0390fd42a2d232dfb 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-17.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/46",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index 8c9a48d9bb8c39c3faf7286d12933fdd2062287b..30ca9405848d76feba49b27e9ddacc74d9ce94cf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-18.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/45",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 3316bbb488dbc7f47749ed743395b73b6960a7b6..130011eb37529d37e552ee367a68bb8b3656e0bd 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-19.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/42",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index 7321f0813122ea0567688bd7a07a8a389c5fa8f3..e39ea824384eb191d41e257ec079f618d4853378 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-2.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/32",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 4e2c211ae2a2bfe5f998d67ea00db6bd5816aab9..82ca80fe98128173ef30c63507321a106ddbfb16 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-20.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/43",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index c0ffb9ce243b1c812be7fa3566daee3f779d1cb1..27d36003d1608e97745bf3b45cb47f6f1cd7c855 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-24.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/48",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 6fb0a28c0cbec58708c6d9db1cb2fd51f9f9f84c..fa127e88513b2d5c0c9691d74813b6dbfd03534d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-25.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/47",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index 5d177c7f2ff86ac9a3cdd373fc2aaf30049e7899..a3f4c2f11723042bd088df0ed451eb4e6039f951 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-3.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/34",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 964c2a8799081f11db7ca209d71860a92cccca53..f3aa04ab059396a8c8e84d897c1519152c867edf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-5.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/29",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index 9a470255e6715ba3f36228c9b43d0a96ba46a70f..494cd67b1dd05a1b950b599d1899ec4133b17ab6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -77,8 +77,8 @@
       "mounted": true,
       "network_address": "parapluie-6.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/36",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index c454791ad87b43668110d661790a8d9ae2ec5401..723b71c59f5c824dc3344bd8172097b46d21a46d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-8.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/33",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index eb2e9794931559a13c56685189316aae3a415293..e8683f8632acc1c08bf6868805c8a5a42b351f87 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -83,8 +83,8 @@
       "name": "enp4s0f1",
       "network_address": "parapluie-9.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "Gi2/35",
+      "switch": null,
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 0ca76215bf098e0db7eecee5069c52d67694aff0..06dbcdbc63fef01b9b354f5074d10cf3d26c00e6 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 7,
-            "uid": "parasilo-pdu-2"
+            "port": 1,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index 2125bb7d6c293c1d2633e3e99165d8f42433f94f..cf54fa4fd7fc649a8e223c243b066445e4049490 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 9,
-            "uid": "parasilo-pdu-1"
+            "port": 3,
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index 0c434bebec77e6a77e37234db03ed5fd3c0986ee..ee6a3c7d803912c073f6cdc1e554c7c631a22732 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 2,
-            "uid": "parasilo-pdu-2"
+            "port": 5,
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index ca017c93596e3d787843a8f468be1d5e1fed01ec..288ef3ec35f2dede67e31dadc514f6374f903ed6 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 7,
-            "uid": "parasilo-pdu-4"
+            "port": 5,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 6b68487af1503a31e3d8395a9bc44f04e35408b2..ae240bd79d85b11c7bb759e0b9039254c05596c4 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 7,
-            "uid": "parasilo-pdu-3"
+            "port": 4,
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 8e898e7970dfc562d38e6cd5a3a5ba00e171148b..70aa57763bc38739a2166c7013b5f22f64bd4c74 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 6,
+            "port": 4,
             "uid": "parasilo-pdu-3"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index 4c40dc8a8e7ee9d4b094f0307666675c6e903543..5dc548effc16f5da094a56f72b1fc6709862be11 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 6,
+            "port": 3,
             "uid": "parasilo-pdu-4"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index 4aac6f1b2544e27ce7622c2826f5a68c319c004c..135b95c0de140e21532dd48687c26f9a864a3203 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 5,
-            "uid": "parasilo-pdu-3"
+            "uid": "parasilo-pdu-1"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index a56cd7ea41bc264936d47a2baafeefe543f86ae6..11fa4e360717260dd839d7dc09f89cf5040c8c0a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 5,
-            "uid": "parasilo-pdu-4"
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index c4441127fb08e78c47f1b174bdfc516ea3b7f3f6..56ac6444fa4a3ac55113c1df33087a41eb2f3a43 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 4,
-            "uid": "parasilo-pdu-3"
+            "uid": "parasilo-pdu-1"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index 6f78e0fafaeca107707c815951e979dd71f9c5bc..fba6bc7ab0458347b68be75116ecbfbe8c9613ac 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 4,
-            "uid": "parasilo-pdu-4"
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index 91cccde939eec06f4eb489e3758cbd78da09f059..15d95639dac1e2684c7f5e73187516dd9c95a6fd 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 10,
-            "uid": "parasilo-pdu-3"
+            "port": 1,
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index db37c240b90a822133b670cf7de452497dfc382c..915bb516403dd01dea69de1c767e379918651c70 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 3,
-            "uid": "parasilo-pdu-3"
+            "uid": "parasilo-pdu-1"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index 2eec7f42e43840fc399368d36b1b111394c15bcc..bb1a77017b4d3e1e8df326b4344ef9a1045b0618 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 3,
+            "port": 10,
             "uid": "parasilo-pdu-4"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 92aca58325174dd5fc829a7a64323f55da4aa9c1..c60c387caebd161b495cb63a174c0d86a78eb2fa 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 2,
+            "port": 10,
             "uid": "parasilo-pdu-3"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index 8c92c14f1f66830cef4ba56d3004f0a249b1dea3..5a7c33dae6743b53f82e9945a795ce20659f213b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 2,
-            "uid": "parasilo-pdu-4"
+            "port": 9,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index 9e6590e1a65e927be12d0888e1191c516d5a1fee..36e020c1ea87109f5ab57d533b4a473c1b168148 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 1,
+            "port": 9,
             "uid": "parasilo-pdu-4"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index d37e4644ace0e4b8d05e447c30ce2035d3523b7d..805bacbfd0125f033b7457cc77465a1590e48ce1 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 17,
-            "uid": "parasilo-pdu-2"
+            "port": 18,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index 53de0d629f04aa553695357e1315bc5a1851d2ca..b325c07153fccfc464eecb9df5328f83ad464a14 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 22,
-            "uid": "parasilo-pdu-2"
+            "port": 17,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index 28b5e962101ebe076aaf5d06575de7e423a55efd..9e9bda1f8a5837f372061e9a417e079bad75f975 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -194,7 +194,7 @@
         "pdu": [
           {
             "port": 18,
-            "uid": "parasilo-pdu-2"
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index fe8cd3f4d0b6a6cff4f568e21118a52660c8cc98..b6f000c7f1661c6ac981b38eb1d5960e6302b3e7 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 21,
-            "uid": "parasilo-pdu-2"
+            "port": 17,
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index fa8544978aa162e2e024b9b84a729bad74351dbc..ca7f258b322c223923d31a062771aebf3d094118 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 10,
-            "uid": "parasilo-pdu-4"
+            "port": 2,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index fff5533ced63252d7fe055e427290d62d183b4e1..78b8629ef0dcde7ee1e738bb51d31b3f6704fc79 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 6,
-            "uid": "parasilo-pdu-2"
+            "port": 2,
+            "uid": "parasilo-pdu-4"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index d8eee2ba890a375b2eed8dd1d1ca51dd5cefe096..25e4976571fcab5dd742ac93e70d82c1a38f66ab 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 5,
-            "uid": "parasilo-pdu-2"
+            "port": 3,
+            "uid": "parasilo-pdu-3"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index 0a42403b88edf95c584507aee8f4a2d07d4997a0..179eb99020c0be0034b0ecfc8d2fa3e6fb1c3c53 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 9,
-            "uid": "parasilo-pdu-4"
+            "port": 2,
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 172a544ea61631092edfcaa578f4707e253919de..808f4fe6b42f885778cffc2d65380f8631f0b0ac 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 4,
+            "port": 1,
             "uid": "parasilo-pdu-2"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 7209b4c2c7b92ba0639965581dbf64385acac33b..8a4cbacc4cc156712a016d9c6bae6b0b85f51358 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 9,
-            "uid": "parasilo-pdu-3"
+            "port": 2,
+            "uid": "parasilo-pdu-1"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index c4f4e2b4fe977f79d6444dcb9800ee9937ec5d39..3b2a3ed118e2c64724eb0c513c4053852f31e219 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 3,
-            "uid": "parasilo-pdu-2"
+            "port": 1,
+            "uid": "parasilo-pdu-1"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
index cf341a555a6a70e1c1a5886066188d5774d50d30..32c5d70f6c44d60a0d96dd390aad0abeafe811df 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 1,
+            "port": 6,
             "uid": "parasilo-pdu-1"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
index 967b0eb73c902e0914b7406ce8e4eddc10c661dc..fff95491959b6f21d198f24c3ea391c1882732df 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json
@@ -193,7 +193,7 @@
         },
         "pdu": [
           {
-            "port": 2,
+            "port": 7,
             "uid": "parasilo-pdu-1"
           }
         ]
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
index 1f04f2baebc8e32ecfcc1e34cbd695b6c3512e9d..d13f9e8c4d68764e08da690f798143df02091286 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 4,
-            "uid": "parasilo-pdu-1"
+            "port": 6,
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
index a3169fd61854be7263781ae0e51268504e9ace78..d02d212df43f0d631a1575cfbedb41ec4f5e4d45 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json
@@ -193,8 +193,8 @@
         },
         "pdu": [
           {
-            "port": 6,
-            "uid": "parasilo-pdu-1"
+            "port": 7,
+            "uid": "parasilo-pdu-2"
           }
         ]
       }
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index ab47479bb2bc4f6c4f2da9829b1ec7b3574c84a9..6f8455bc5218ee75e77099ea03dcc6a0a090d8f8 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -41,16 +41,12 @@
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-3"
         },
         {
         },
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-7"
         },
         {
         },
@@ -97,63 +93,60 @@
         {
         },
         {
-          "uid": "parapluie-5"
         },
         {
         },
         {
-          "uid": "parapluie-10"
         },
         {
-          "uid": "parapluie-2"
         },
         {
-          "uid": "parapluie-8"
         },
         {
-          "uid": "parapluie-3"
         },
         {
-          "uid": "parapluie-9"
         },
         {
-          "uid": "parapluie-6"
         },
         {
-          "uid": "parapluie-13"
         },
         {
-          "uid": "parapluie-14"
         },
         {
-          "uid": "parapluie-15"
         },
         {
-          "uid": "parapluie-11"
         },
         {
-          "uid": "parapluie-12"
+          "port": "eth2",
+          "uid": "paranoia-1"
         },
         {
-          "uid": "parapluie-19"
+          "port": "eth2",
+          "uid": "paranoia-2"
         },
         {
-          "uid": "parapluie-20"
+          "port": "eth2",
+          "uid": "paranoia-3"
         },
         {
-          "uid": "parapluie-16"
+          "port": "eth2",
+          "uid": "paranoia-4"
         },
         {
-          "uid": "parapluie-18"
+          "port": "eth2",
+          "uid": "paranoia-5"
         },
         {
-          "uid": "parapluie-17"
+          "port": "eth2",
+          "uid": "paranoia-6"
         },
         {
-          "uid": "parapluie-25"
+          "port": "eth2",
+          "uid": "paranoia-7"
         },
         {
-          "uid": "parapluie-24"
+          "port": "eth2",
+          "uid": "paranoia-8"
         }
       ],
       "rate": 1000000000,
@@ -169,14 +162,10 @@
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-4"
         },
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-1"
         },
         {
         },
@@ -185,26 +174,18 @@
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-5"
         },
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-2"
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-6"
         },
         {
         },
         {
         },
         {
-          "port": "eth2",
-          "uid": "paranoia-8"
         },
         {
         },
diff --git a/data/grid5000/sites/rennes/servers/ceph-mon0.json b/data/grid5000/sites/rennes/servers/ceph-mon0.json
new file mode 100644
index 0000000000000000000000000000000000000000..2277b04d32b7f302c80d795214bc843b9181cff2
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/ceph-mon0.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.111.158"
+    }
+  },
+  "type": "server",
+  "uid": "ceph-mon0"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/ceph-mon1.json b/data/grid5000/sites/rennes/servers/ceph-mon1.json
new file mode 100644
index 0000000000000000000000000000000000000000..21247ff131d0715d1ef59bae0365d4fdb444b579
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/ceph-mon1.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.111.159"
+    }
+  },
+  "type": "server",
+  "uid": "ceph-mon1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/ceph-mon2.json b/data/grid5000/sites/rennes/servers/ceph-mon2.json
new file mode 100644
index 0000000000000000000000000000000000000000..4f85898767d1b6f314b8b4140cbdc39352369f9b
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/ceph-mon2.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.111.160"
+    }
+  },
+  "type": "server",
+  "uid": "ceph-mon2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/es-oar.json b/data/grid5000/sites/rennes/servers/es-oar.json
new file mode 100644
index 0000000000000000000000000000000000000000..4186961ac3d5dd32d1219130ba0ddf171e1c8c8f
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/es-oar.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.111.161"
+    }
+  },
+  "type": "server",
+  "uid": "es-oar"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/es-phoenix.json b/data/grid5000/sites/rennes/servers/es-phoenix.json
new file mode 100644
index 0000000000000000000000000000000000000000..75a1c8834a720340c4eed014814a1457d738299e
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/es-phoenix.json
@@ -0,0 +1,10 @@
+{
+  "kind": "virtual",
+  "network_adapters": {
+    "default": {
+      "ip": "172.16.111.162"
+    }
+  },
+  "type": "server",
+  "uid": "es-phoenix"
+}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index 9efa223128f056f44a0bc8682f8d17c5937199a2..f4dab43db0611440ca149425900f2b5c9b758e71 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -219,7 +219,7 @@
     "grenoble": {
       "clusters": {
         "edel": {
-          "created_at": "Fri, 03 Oct 2008 00:00:00 GMT",
+          "created_at": "Thu, 02 Oct 2008 22:00:00 GMT",
           "kavlan": true,
           "model": "Bull bullx B500 compute blades",
           "nodes": {
@@ -14303,7 +14303,7 @@
           "uid": "edel"
         },
         "genepi": {
-          "created_at": "Wed, 01 Oct 2008 00:00:00 GMT",
+          "created_at": "Tue, 30 Sep 2008 22:00:00 GMT",
           "kavlan": true,
           "model": "Bull R422-E1",
           "nodes": {
@@ -22035,7 +22035,7 @@
     "lille": {
       "clusters": {
         "chetemi": {
-          "created_at": "Thu, 01 Dec 2016 00:00:00 GMT",
+          "created_at": "Wed, 30 Nov 2016 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -25274,7 +25274,7 @@
           "uid": "chetemi"
         },
         "chifflet": {
-          "created_at": "Thu, 01 Dec 2016 00:00:00 GMT",
+          "created_at": "Wed, 30 Nov 2016 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R730",
           "nodes": {
@@ -28718,7 +28718,7 @@
     "luxembourg": {
       "clusters": {
         "granduc": {
-          "created_at": "Thu, 01 Dec 2011 00:00:00 GMT",
+          "created_at": "Wed, 30 Nov 2011 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge 1950",
           "nodes": {
@@ -33425,7 +33425,7 @@
           "uid": "granduc"
         },
         "petitprince": {
-          "created_at": "Tue, 10 Sep 2013 00:00:00 GMT",
+          "created_at": "Mon, 09 Sep 2013 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge M620",
           "nodes": {
@@ -62945,7 +62945,7 @@
     "nancy": {
       "clusters": {
         "graoully": {
-          "created_at": "Mon, 04 Jan 2016 00:00:00 GMT",
+          "created_at": "Sun, 03 Jan 2016 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -67246,7 +67246,7 @@
           "uid": "graoully"
         },
         "graphene": {
-          "created_at": "Thu, 20 Jan 2011 00:00:00 GMT",
+          "created_at": "Wed, 19 Jan 2011 23:00:00 GMT",
           "kavlan": true,
           "model": "Carri System 5393",
           "nodes": {
@@ -100149,7 +100149,7 @@
           "uid": "graphique"
         },
         "graphite": {
-          "created_at": "Thu, 05 Dec 2013 00:00:00 GMT",
+          "created_at": "Wed, 04 Dec 2013 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R720",
           "nodes": {
@@ -101210,7 +101210,7 @@
           "uid": "graphite"
         },
         "grele": {
-          "created_at": "Mon, 26 Jun 2017 00:00:00 GMT",
+          "created_at": "Sun, 25 Jun 2017 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R730",
           "nodes": {
@@ -104276,7 +104276,7 @@
           "uid": "grele"
         },
         "griffon": {
-          "created_at": "Fri, 10 Apr 2009 00:00:00 GMT",
+          "created_at": "Thu, 09 Apr 2009 22:00:00 GMT",
           "kavlan": true,
           "model": "Carri System CS-5393B",
           "nodes": {
@@ -108813,10 +108813,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -108915,10 +108911,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109017,10 +109009,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109119,10 +109107,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109221,10 +109205,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109323,10 +109303,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109425,10 +109401,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109527,10 +109499,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109629,10 +109597,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109731,10 +109695,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110028,10 +109988,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110130,10 +110086,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110232,10 +110184,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110334,10 +110282,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110436,10 +110380,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110538,10 +110478,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110640,10 +110576,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110742,10 +110674,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110844,10 +110772,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110946,10 +110870,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111250,10 +111170,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111352,10 +111268,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111454,10 +111366,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111556,10 +111464,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111658,10 +111562,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111760,10 +111660,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111862,10 +111758,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111964,10 +111856,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112863,10 +112751,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112965,10 +112849,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113067,10 +112947,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113169,10 +113045,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113271,10 +113143,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113373,10 +113241,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113475,10 +113339,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113577,10 +113437,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113679,10 +113535,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113983,10 +113835,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114085,10 +113933,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114187,10 +114031,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114289,10 +114129,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114391,10 +114227,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114493,10 +114325,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114595,10 +114423,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114697,10 +114521,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114799,10 +114619,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114901,10 +114717,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115205,10 +115017,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115307,10 +115115,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115409,10 +115213,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115511,10 +115311,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115613,10 +115409,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115715,10 +115507,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115817,10 +115605,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115919,10 +115703,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116021,10 +115801,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116123,10 +115899,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116420,10 +116192,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116522,10 +116290,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116624,10 +116388,6 @@
               "gpu": {
                 "gpu": false
               },
-              "monitoring": {
-                "metric": "power",
-                "wattmeter": "shared"
-              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116732,7 +116492,7 @@
           "uid": "griffon"
         },
         "grimani": {
-          "created_at": "Tue, 30 Aug 2016 00:00:00 GMT",
+          "created_at": "Mon, 29 Aug 2016 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R730",
           "nodes": {
@@ -118029,7 +117789,7 @@
           "uid": "grimani"
         },
         "grimoire": {
-          "created_at": "Fri, 22 Jan 2016 00:00:00 GMT",
+          "created_at": "Thu, 21 Jan 2016 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -120706,7 +120466,7 @@
           "uid": "grimoire"
         },
         "grisou": {
-          "created_at": "Mon, 04 Jan 2016 00:00:00 GMT",
+          "created_at": "Sun, 03 Jan 2016 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -140306,7 +140066,7 @@
     "nantes": {
       "clusters": {
         "econome": {
-          "created_at": "Wed, 16 Apr 2014 00:00:00 GMT",
+          "created_at": "Tue, 15 Apr 2014 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge C6220",
           "nodes": {
@@ -155771,7 +155531,7 @@
     "rennes": {
       "clusters": {
         "paranoia": {
-          "created_at": "Fri, 21 Feb 2014 00:00:00 GMT",
+          "created_at": "Thu, 20 Feb 2014 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge C6220 II",
           "nodes": {
@@ -155921,7 +155681,7 @@
                   "network_address": "paranoia-1-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/3",
+                  "switch_port": "Gi2/41",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -156219,7 +155979,7 @@
                   "network_address": "paranoia-2-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/9",
+                  "switch_port": "Gi2/42",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -156517,7 +156277,7 @@
                   "network_address": "paranoia-3-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi2/3",
+                  "switch_port": "Gi2/43",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -156815,7 +156575,7 @@
                   "network_address": "paranoia-4-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/1",
+                  "switch_port": "Gi2/44",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -157113,7 +156873,7 @@
                   "network_address": "paranoia-5-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/7",
+                  "switch_port": "Gi2/45",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -157411,7 +157171,7 @@
                   "network_address": "paranoia-6-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/10",
+                  "switch_port": "Gi2/46",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -157709,7 +157469,7 @@
                   "network_address": "paranoia-7-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi2/6",
+                  "switch_port": "Gi2/47",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -158007,7 +157767,7 @@
                   "network_address": "paranoia-8-eth2.rennes.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "c6509",
-                  "switch_port": "Gi3/13",
+                  "switch_port": "Gi2/48",
                   "vendor": "Intel",
                   "version": "Intel Corporation"
                 },
@@ -158168,7 +157928,7 @@
           "uid": "paranoia"
         },
         "parapide": {
-          "created_at": "Mon, 25 Jan 2010 00:00:00 GMT",
+          "created_at": "Sun, 24 Jan 2010 23:00:00 GMT",
           "kavlan": true,
           "model": "SUN FIRE X2270",
           "nodes": {
@@ -163599,7 +163359,7 @@
           "uid": "parapide"
         },
         "parapluie": {
-          "created_at": "Tue, 02 Nov 2010 00:00:00 GMT",
+          "created_at": "Mon, 01 Nov 2010 23:00:00 GMT",
           "kavlan": true,
           "model": "HP ProLiant DL165 G7",
           "nodes": {
@@ -163936,8 +163696,8 @@
                   "mounted": true,
                   "network_address": "parapluie-10.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/31",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -164182,8 +163942,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-11.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/40",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -164436,8 +164196,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-12.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/41",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -164690,8 +164450,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-13.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/37",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -164938,8 +164698,8 @@
                   "mounted": true,
                   "network_address": "parapluie-14.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/38",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -165184,8 +164944,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-15.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/39",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -165438,8 +165198,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-16.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/44",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -165685,8 +165445,8 @@
                   "mounted": true,
                   "network_address": "parapluie-17.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/46",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -165925,8 +165685,8 @@
                   "mounted": true,
                   "network_address": "parapluie-18.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/45",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -166171,8 +165931,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-19.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/42",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -166425,8 +166185,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-2.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/32",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -166679,8 +166439,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-20.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/43",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -167675,8 +167435,8 @@
                   "mounted": true,
                   "network_address": "parapluie-24.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/48",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -167921,8 +167681,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-25.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/47",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -169143,8 +168903,8 @@
                   "mounted": true,
                   "network_address": "parapluie-3.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/34",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -172319,8 +172079,8 @@
                   "mounted": true,
                   "network_address": "parapluie-5.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/29",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -172559,8 +172319,8 @@
                   "mounted": true,
                   "network_address": "parapluie-6.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/36",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -173045,8 +172805,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-8.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/33",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -173299,8 +173059,8 @@
                   "name": "enp4s0f1",
                   "network_address": "parapluie-9.rennes.grid5000.fr",
                   "rate": 1000000000,
-                  "switch": "c6509",
-                  "switch_port": "Gi2/35",
+                  "switch": null,
+                  "switch_port": null,
                   "vendor": "Intel",
                   "version": "82576"
                 },
@@ -173477,7 +173237,7 @@
           "uid": "parapluie"
         },
         "parasilo": {
-          "created_at": "Tue, 13 Jan 2015 00:00:00 GMT",
+          "created_at": "Mon, 12 Jan 2015 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -173676,8 +173436,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 7,
-                        "uid": "parasilo-pdu-2"
+                        "port": 1,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -173970,8 +173730,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 9,
-                        "uid": "parasilo-pdu-1"
+                        "port": 3,
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -174264,8 +174024,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 2,
-                        "uid": "parasilo-pdu-2"
+                        "port": 5,
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -174558,8 +174318,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 7,
-                        "uid": "parasilo-pdu-4"
+                        "port": 5,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -174852,8 +174612,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 7,
-                        "uid": "parasilo-pdu-3"
+                        "port": 4,
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -175146,7 +174906,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 6,
+                        "port": 4,
                         "uid": "parasilo-pdu-3"
                       }
                     ]
@@ -175440,7 +175200,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 6,
+                        "port": 3,
                         "uid": "parasilo-pdu-4"
                       }
                     ]
@@ -175735,7 +175495,7 @@
                     "pdu": [
                       {
                         "port": 5,
-                        "uid": "parasilo-pdu-3"
+                        "uid": "parasilo-pdu-1"
                       }
                     ]
                   }
@@ -176029,7 +175789,7 @@
                     "pdu": [
                       {
                         "port": 5,
-                        "uid": "parasilo-pdu-4"
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -176323,7 +176083,7 @@
                     "pdu": [
                       {
                         "port": 4,
-                        "uid": "parasilo-pdu-3"
+                        "uid": "parasilo-pdu-1"
                       }
                     ]
                   }
@@ -176617,7 +176377,7 @@
                     "pdu": [
                       {
                         "port": 4,
-                        "uid": "parasilo-pdu-4"
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -176910,8 +176670,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 10,
-                        "uid": "parasilo-pdu-3"
+                        "port": 1,
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -177205,7 +176965,7 @@
                     "pdu": [
                       {
                         "port": 3,
-                        "uid": "parasilo-pdu-3"
+                        "uid": "parasilo-pdu-1"
                       }
                     ]
                   }
@@ -177498,7 +177258,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 3,
+                        "port": 10,
                         "uid": "parasilo-pdu-4"
                       }
                     ]
@@ -177792,7 +177552,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 2,
+                        "port": 10,
                         "uid": "parasilo-pdu-3"
                       }
                     ]
@@ -178086,8 +177846,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 2,
-                        "uid": "parasilo-pdu-4"
+                        "port": 9,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -178380,7 +178140,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 1,
+                        "port": 9,
                         "uid": "parasilo-pdu-4"
                       }
                     ]
@@ -178674,8 +178434,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 17,
-                        "uid": "parasilo-pdu-2"
+                        "port": 18,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -178968,8 +178728,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 22,
-                        "uid": "parasilo-pdu-2"
+                        "port": 17,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -179263,7 +179023,7 @@
                     "pdu": [
                       {
                         "port": 18,
-                        "uid": "parasilo-pdu-2"
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -179556,8 +179316,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 21,
-                        "uid": "parasilo-pdu-2"
+                        "port": 17,
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -179850,8 +179610,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 10,
-                        "uid": "parasilo-pdu-4"
+                        "port": 2,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -180144,8 +179904,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 6,
-                        "uid": "parasilo-pdu-2"
+                        "port": 2,
+                        "uid": "parasilo-pdu-4"
                       }
                     ]
                   }
@@ -180438,8 +180198,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 5,
-                        "uid": "parasilo-pdu-2"
+                        "port": 3,
+                        "uid": "parasilo-pdu-3"
                       }
                     ]
                   }
@@ -180732,8 +180492,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 9,
-                        "uid": "parasilo-pdu-4"
+                        "port": 2,
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -181026,7 +180786,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 4,
+                        "port": 1,
                         "uid": "parasilo-pdu-2"
                       }
                     ]
@@ -181320,8 +181080,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 9,
-                        "uid": "parasilo-pdu-3"
+                        "port": 2,
+                        "uid": "parasilo-pdu-1"
                       }
                     ]
                   }
@@ -181614,8 +181374,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 3,
-                        "uid": "parasilo-pdu-2"
+                        "port": 1,
+                        "uid": "parasilo-pdu-1"
                       }
                     ]
                   }
@@ -181722,7 +181482,7 @@
           "uid": "parasilo"
         },
         "paravance": {
-          "created_at": "Tue, 13 Jan 2015 00:00:00 GMT",
+          "created_at": "Mon, 12 Jan 2015 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R630",
           "nodes": {
@@ -181921,7 +181681,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 1,
+                        "port": 6,
                         "uid": "parasilo-pdu-1"
                       }
                     ]
@@ -184572,7 +184332,7 @@
                     },
                     "pdu": [
                       {
-                        "port": 2,
+                        "port": 7,
                         "uid": "parasilo-pdu-1"
                       }
                     ]
@@ -189874,8 +189634,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 4,
-                        "uid": "parasilo-pdu-1"
+                        "port": 6,
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -195176,8 +194936,8 @@
                     },
                     "pdu": [
                       {
-                        "port": 6,
-                        "uid": "parasilo-pdu-1"
+                        "port": 7,
+                        "uid": "parasilo-pdu-2"
                       }
                     ]
                   }
@@ -199321,32 +199081,37 @@
               "model": "WS-X6748-GE-TX",
               "port": "eth1",
               "ports": {
-                "29": "parapluie-5",
-                "3": {
+                "41": {
+                  "port": "eth2",
+                  "uid": "paranoia-1"
+                },
+                "42": {
+                  "port": "eth2",
+                  "uid": "paranoia-2"
+                },
+                "43": {
                   "port": "eth2",
                   "uid": "paranoia-3"
                 },
-                "31": "parapluie-10",
-                "32": "parapluie-2",
-                "33": "parapluie-8",
-                "34": "parapluie-3",
-                "35": "parapluie-9",
-                "36": "parapluie-6",
-                "37": "parapluie-13",
-                "38": "parapluie-14",
-                "39": "parapluie-15",
-                "40": "parapluie-11",
-                "41": "parapluie-12",
-                "42": "parapluie-19",
-                "43": "parapluie-20",
-                "44": "parapluie-16",
-                "45": "parapluie-18",
-                "46": "parapluie-17",
-                "47": "parapluie-25",
-                "48": "parapluie-24",
-                "6": {
+                "44": {
+                  "port": "eth2",
+                  "uid": "paranoia-4"
+                },
+                "45": {
+                  "port": "eth2",
+                  "uid": "paranoia-5"
+                },
+                "46": {
+                  "port": "eth2",
+                  "uid": "paranoia-6"
+                },
+                "47": {
                   "port": "eth2",
                   "uid": "paranoia-7"
+                },
+                "48": {
+                  "port": "eth2",
+                  "uid": "paranoia-8"
                 }
               },
               "rate": 1000000000,
@@ -199359,22 +199124,6 @@
               "model": "WS-X6748-GE-TX",
               "port": "eth0",
               "ports": {
-                "1": {
-                  "port": "eth2",
-                  "uid": "paranoia-4"
-                },
-                "10": {
-                  "port": "eth2",
-                  "uid": "paranoia-6"
-                },
-                "13": {
-                  "port": "eth2",
-                  "uid": "paranoia-8"
-                },
-                "3": {
-                  "port": "eth2",
-                  "uid": "paranoia-1"
-                },
                 "42": {
                   "port": "eth1",
                   "uid": "parapluie-1"
@@ -199398,14 +199147,6 @@
                 "48": {
                   "port": "eth1",
                   "uid": "parapluie-22"
-                },
-                "7": {
-                  "port": "eth2",
-                  "uid": "paranoia-5"
-                },
-                "9": {
-                  "port": "eth2",
-                  "uid": "paranoia-2"
                 }
               },
               "rate": 1000000000,
@@ -201353,6 +201094,36 @@
           "type": "server",
           "uid": "ca"
         },
+        "ceph-mon0": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.111.158"
+            }
+          },
+          "type": "server",
+          "uid": "ceph-mon0"
+        },
+        "ceph-mon1": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.111.159"
+            }
+          },
+          "type": "server",
+          "uid": "ceph-mon1"
+        },
+        "ceph-mon2": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.111.160"
+            }
+          },
+          "type": "server",
+          "uid": "ceph-mon2"
+        },
         "ceph0": {
           "alias": [
             "ceph"
@@ -201527,6 +201298,26 @@
           "type": "server",
           "uid": "elblablo"
         },
+        "es-oar": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.111.161"
+            }
+          },
+          "type": "server",
+          "uid": "es-oar"
+        },
+        "es-phoenix": {
+          "kind": "virtual",
+          "network_adapters": {
+            "default": {
+              "ip": "172.16.111.162"
+            }
+          },
+          "type": "server",
+          "uid": "es-phoenix"
+        },
         "frennes": {
           "alias": [
             "frontale",
@@ -202137,7 +201928,7 @@
     "sophia": {
       "clusters": {
         "sol": {
-          "created_at": "Fri, 23 Feb 2007 00:00:00 GMT",
+          "created_at": "Thu, 22 Feb 2007 23:00:00 GMT",
           "kavlan": true,
           "model": "Sun Fire X2200 M2",
           "nodes": {
@@ -210188,7 +209979,7 @@
           "uid": "sol"
         },
         "suno": {
-          "created_at": "Wed, 27 Jan 2010 00:00:00 GMT",
+          "created_at": "Tue, 26 Jan 2010 23:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R410",
           "nodes": {
@@ -217394,7 +217185,7 @@
           "uid": "suno"
         },
         "uva": {
-          "created_at": "Fri, 01 Jul 2016 00:00:00 GMT",
+          "created_at": "Thu, 30 Jun 2016 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge R900",
           "nodes": {
@@ -220207,7 +219998,7 @@
           "uid": "uva"
         },
         "uvb": {
-          "created_at": "Fri, 01 Jul 2016 00:00:00 GMT",
+          "created_at": "Thu, 30 Jun 2016 22:00:00 GMT",
           "kavlan": true,
           "model": "Dell PowerEdge C6100",
           "nodes": {