diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 8192e2f09cd5f4525be676c018260f4cd375823d..5d6573675e9da4651ff54f336707aa6da278b9b9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index 070c8dfb3e8909a5ff675b404b05fc700c9f5bc8..1471568c233061ddaf65848c9d330577b54fbea2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index aeaff0ec93f32a1511080a37fa61b9b3001af4f2..559ae78945b5387bccf9ec9ffb50bcfade530dc5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index 1525a9a1628d69858c1475a6f6215989189f3891..908b7e6c6b57adfb929dca1d0e3c999086d55a8a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index 1488f80a3b35a54140f82dcd5604e4cd9dd3d839..c5304aacb400f86219804849de1601eaafacf9dc 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index a67e3de89a8633f7c501023ccc53396e3f697c1c..9b26d78758c9ea0d6b5afde8e35cb4dd5d38b71b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 4cac61e29c436f493c35f7a65620134e4486bbd9..ad211c22200aaa2ec6e29e360c62b22d009e68b1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index 775746237294a6fb4465c62f7a248730faf84041..12c9fbf3f882a925a637871b4debaf14d322d358 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index c30342713febf3df2e5a31fb4d925a25997d8155..3f1ae0db97b90304e4aa9d8ff453e5b37fbd887f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index adda8d1d6a85e208573fa78eaff8c5a5f08b01f7..981c857e06cc1d5af70f70e8a40802687a3e11be 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index e6e9fa4abce0466dfddd5c1538adbee5f36dd280..6128574c5acce9335d5bdaf22b7c0634b2eb6a17 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index e1c1914eef77cedd38d77b6b526cee0620a58d7d..d23baf6d5adbf46278dcf9bf74d266089db08c2e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index 8c18ca7b1b61ae52be4a9239da293a598bf3c0b4..dc330d3401ea85376c828879277d500a9e3a1e9c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 9fc83dc5e2cae284fdb3d30f41d8eec48afa3a8d..5c2f2f41d8351e4997dd4c814d1aa2e2a6335826 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index d983ce9dada52ebc15e976c3f1724cae963e75e6..c652399da27352fd51313056ebaa5256487fdd3b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index f1086250e95cba564069777b02d3d5597a8a09e1..2b011f684d5178c79d4cc597d6f816c88c5ec943 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index 342b2a5c68ef9ecb60bb64bd39d3e73f9002aedb..14d55e6130b943e2513842cb5c985f5d68bee16e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 9ed49d8dbf4ae24db967fc003f23a170a9b96059..cdbeefdf26a032bf4b93254db4ee56748f21d8c5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index 002c366746785187ae009e43e1c91e6e5669d02e..d6b3776eb2d181102c4d410436b30e82a2cc1d16 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index a6574908f301fd1f467ce0738b921667b9d06ef3..0e14a92e85839bb585b90b19f32ad1f8b7886f6b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 2c0c33af16b8250eaf242136bb9a4dfb7f1757d4..e6a408740cc55b493b88627e67747bb77cd8a66d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 78e78499489e0f0af29b7dbd99dc8d39ce4edefb..3ac6a54f537efb2f678f6e173beb56ba859cabf6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index 3e701adbe92c6974e53126fa82bd9e09e32378b7..fb1d77100e5fce95b4ae48621cf232d46edbf9e1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index e23a5a608073d924009e7d3e6e598b0524ea9cf4..d5472e484edec0fcbfcbe744c570a4b4e69c5f46 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index 9dd1d407af4a8ec51135fef4df0583a6968f38ad..a52b6965a0ae131952f99794e06dc7f2c075f3a2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index ae0e0635377e21428251e4a4bb9cfb4cf6a15013..153b81c8c1e8a9fbaf8a050cab7fe77d68ce6b1d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 772089e5e263d7f121a2e3a63806b40930419f0a..c1b3dabc60dc592fcaeb120dc223b76239064d9b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 029668d00675d83dfaa3b4308daa377a02ab8271..d55cdc5ec6e115b405cf6ab6ecf4a558549a2cb5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 83e2690e5f30631cd7e72ca49155cbe188c958a7..9a9ff4bcfcb5b7e160f788d8d0f63a2e33dddf32 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 47a69c5833b084d316e4af978b3ad2857801a9df..5f1bc4d80ff500fdd9d7c85f7a6de3730edca05f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index c7ace7b9057bfb8fa06542db5ec3dd1c8c981822..8c9aa0f91b2b6155bfa23d83148a4c1b4cca1736 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index 66799a324a29e573578024195d41f7e09f04bd39..909d15b2f06c07d3117f7109b47b9b2c5cf09c1f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index 78bd2f1f0d0d64bb2833c3b0ba47e34be87b71aa..b691fce1aaceaf12075401e0af7e44c1c1cb07f7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index 3f322e0fa09244f526273710da94122f19acad36..ee5d0c9f9569aae7855a21ab02abe683d08e424b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index e562250c374e0b33438352e40f3845d0f9fecb8b..0af0deb73499cf13afe81147621803a0f16eef4c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 1b216d2122115c3f1d0d512faa4d4c87212609d3..4c4419de3b157530d0e19777e1f00a24744dfece 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index f50ffc3d35be36b7474f089f14d4c62bd6b9bfc0..af42d6f0454838d2143ec4e7f14d6373d7b84c74 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index d50c7c4a59fec70451f74126bdac6127b8ff75ec..8ff330a9a355cd44bd5d67764f2131a57d281d48 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 5b624adbff449afa8a06f7daa3f586b54d151a35..6abe8d71f4d2a48a829e9c957a9f81ac07a94944 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 4e065f317e870ea94a08727b8973c95cc687bf8a..10a1f6eb679a8932b345756d0d31c8939f98a074 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index a45bb0ab19b30bfa5eedf361d9b93c713c3c008f..16f4208be7095020b0ec6951e8ff6a54255325df 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index b478ae0b03aef763a00ddca130f22c1085bfb634..6414bb42a1dda430e8616fb953320dfa3fbf96ed 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index 5fbb6289fa861c3071cf46bc96fae15bace2cf7a..0b4266e1120543c749be249d7c782af16afa9295 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index 1178f61d7ad1637dcb980eb285d092189ef0a551..fbf25e58f116d0fc4332eaccfa7b66804b6657c4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index eead68dad9a98c05187b85a6da27970d5df89ff5..5ccee4c12d33a77b4056765e94345cc9abd9fb5f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index a7e2be931ff03a31f1ee6230704f21cf862da55e..e74b2fd1b3a198a8ffbdd146644e365e9cd9596f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index 476d6274414ac427ef681a03b559f5e35a18a22c..cf8400054d99257765f57bcd5cda9ebd88ace728 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index 719574fdad16612fec572447f2a7a5a094bdc10f..8963bcf98423807cefeaeff0949bbf65b17b960f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index cf028fdd39dc475c79804e10014394e3d0367227..4b6afb0243c18ba73b9f80a0ab9b2b1bb3f2e64d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index 25e4fcc2f52925cbf71a50963fa37b6abad15a52..ab2b89fde62db20f5b5706a922a453f3385fa04a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index 9ffe61301239da7abbe842002e7f16a5744eafbb..b26fa5ca838ddf0f4716f50acd6d680962a953bc 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/generators/input/sites/nancy/clusters/grisou/grisou.rb b/generators/input/sites/nancy/clusters/grisou/grisou.rb
index 7dc74e0df9742374329cecc8d59e2cd58f9e3eaa..c915465b38842c338fa1f342317cdb4bd104d8f0 100644
--- a/generators/input/sites/nancy/clusters/grisou/grisou.rb
+++ b/generators/input/sites/nancy/clusters/grisou/grisou.rb
@@ -154,8 +154,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -170,8 +168,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',
@@ -218,8 +214,6 @@ site :nancy do |site_uid|
           :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth1'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
@@ -234,8 +228,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth2'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
@@ -250,8 +242,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth3'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
@@ -266,8 +256,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -282,8 +270,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',
@@ -330,8 +316,6 @@ site :nancy do |site_uid|
           :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth1'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
@@ -346,8 +330,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -362,8 +344,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',