diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index 9bd86c8f91be482261f08cd611c232a33eb876f1..1454ed011c4e3ac8bd0d732fb036b944e5e25d5a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index 5d6adaf74365f1fd5415aef81ea65b1ca7eef287..354f9c271d0ee0f5f6b2107aa46e759bb764322c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 3f9d8e63b2bf0401526dc5a0569af2e4b1679463..7f617116be0faf77a20954b84e9324b01dea8a41 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -114,7 +114,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index 0edfd7ad914ec29fc9e0b78e3818811a51965672..a66b245bbc0ba63fbe6494151669b9a25333eda1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -108,7 +108,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 7e7b0399d0ce2b2282b7a2673bd920cb2a723609..80939c0b7bc126ca2f8aa563b3fac55588b0fef9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -109,7 +109,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 5fcb445e81a1402f888823c3588fc8549e901b06..79ff644f9af23536221f36ef3c007b236b7c6aa5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -114,7 +114,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 0b710c4146131678de605ae6324a9e2dd0d7bb1f..123d2592eb6a04c5d7b83be4ec768c1e65518dde 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index a19fd7928e447b9d98ef33cc43b4f51a2ad5d4a7..ba02520779b4313da6ddc17303104f68e5977be0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index 102e256a003f0fe50edb06feb5e9e23cb63cdab5..2c09dd6bccc2ae8e9312d16f4a9a62f86e75168e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 77cd32a99c6731bbada5ba9048d8988a58347a64..8931dac74d2732fd95c98aa0a2ec5397c7384a9f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index f33f6afd7f85898cf71f46483c20b474c8c71a60..268ae217844c42b379c912a16e19048fa00ea1ed 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index 188975c67af0a866560d5d1d76d27cd8dcc3ba40..4f71dd7d38ba9bf27cb96084d0999daca85c090f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index d9bd76ea3c92de4d9b25286e0824427326369ff2..6521b40e1240fe626775b4b76e759666c943959a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index 87767e9ee7336f8f21b5f257182227346b1a06c0..198bc511186b6e40f2c46d5024c0238a35c5ceba 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index bd4964a802419fc0284e0c3844bb8161266fcbef..6565b44e9a2143a8d3e64b5e28c88edfb50cd94d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index f00623f5770f0d9cad1a5b60976f589d564a5ad2..d4c0b0484b4afceb30476f1c1ba7d19be1a196c6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index ee5dbcaad07e30b167ce775b913e176b22b6874f..6b82575cd8ec82fbb893f30804bed7af57fa246d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index 395c3ac84779aaa4f2995202225071878cf775be..9bd06c4be999bad9fa3041fbd7cf56996848a610 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 513b14e43ee6bc58ebf8e2f692702c447c9c8b85..718843e4584a6f2fd02734039371a7456d1d39b0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index 2844f8e13aef2ba06e998ccfdd12c1ce443cdb42..352509f1328424e697c984459380b31fd0502b74 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index aec32411065a764c77ea9a05e4cd83cc881e2d14..990d8502930d7dd15e4be0e2ab4ca723bc93fade 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index fc830f423c86b89e80c53881ca0758573bf1fd6a..1cf7415c57da0deb53a227f9309468578298e6c0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 8ca7efe6bbfe2dbc2f6658910fbc7d61ea55b26a..e04370b45f6f204861d8a14757041b5c2faa2124 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 160a89586839663aa43f8b2e64d9cdf590afc3c3..faa5398c5eed9acd27f0c1653eef81b384afc5d2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index cc4f825da3be3dd1a5a30bbbd70c3b95d83725af..0dee388c04d5a5e280218f9e32c376969874317e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index 67db19dc71ebc698173077fcfcc01f4685382dd9..fd93a51e11ec884fba87476c0630f1a79f36b112 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index 452a9bc23f01223961909827400c81a249ee107f..5ee8d6532668f8341dbf571710fd05d8d66f621d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -94,7 +94,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index 0e192d2f58047286e768cdad8f53524bd392ee8f..318e5387143788fa6c5899759a1c94149f94ee47 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index 3ab08553e065aedc42314d104454ac7b95181ad5..d3a94f9a154da4eb5f7bcb6981b6682e6227e4d3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index 832d3a426c77252efeb7630d66dd32347b78737d..685d806900dee11c076d18e2b3608f442e3ba622 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -99,7 +99,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index 155bfe2535cadba3bcb54a1257a3ddad77270540..accfeba94fa5809c2818c1b28cf21cd2f00e1145 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -93,7 +93,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffonib",
       "vendor": "Mellanox",
       "version": "MT26418"
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
index b4f08c44bd5cdefcf069304141d2f392284bffc6..947051f35d49763204df7d7f51cec62904ed0a55 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -54,8 +54,68 @@
         {
         },
         {
-          "kind": "switch",
-          "uid": "sgriffonib"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "uid": "node-mapping-undocumented-for-this-ib-switch"
         }
       ],
       "rate": 20000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
index 3f594322b2398cc747e69205cdc75c78df86c49d..2a3f24ed0944d9463c7ff532fd6eaee638bbeb26 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
@@ -54,8 +54,68 @@
         {
         },
         {
-          "kind": "switch",
-          "uid": "sgriffonib"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "uid": "node-mapping-undocumented-for-this-ib-switch"
         }
       ],
       "rate": 20000000000,
diff --git a/grid5000-all.json b/grid5000-all.json
index c3c7ef6f458321a4d65bb3990a36148e7c4a9b06..ec7bd0d3ef27758853431a3b079fcb13df19e664 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -109350,7 +109350,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -109551,7 +109550,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -109773,7 +109771,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -109989,7 +109986,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -110206,7 +110202,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -110428,7 +110423,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -110635,7 +110629,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -110842,7 +110835,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -111049,7 +111041,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -111256,7 +111247,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -111463,7 +111453,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -111664,7 +111653,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -111865,7 +111853,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -112066,7 +112053,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -112273,7 +112259,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -112480,7 +112465,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -112687,7 +112671,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -112894,7 +112877,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -113101,7 +113083,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -113308,7 +113289,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -113515,7 +113495,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -113722,7 +113701,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -113926,7 +113904,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -114133,7 +114110,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -114370,7 +114346,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -114601,7 +114576,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -114808,7 +114782,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -115010,7 +114983,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -115211,7 +115183,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -115445,7 +115416,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -115682,7 +115652,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -115913,7 +115882,6 @@
                   "mountable": false,
                   "mounted": false,
                   "rate": 10000000000,
-                  "switch": "sgriffonib",
                   "vendor": "Mellanox",
                   "version": "MT26418"
                 },
@@ -158726,9 +158694,9 @@
               "kavlan_pattern": "%LINECARD%/%PORT%",
               "kind": "switch",
               "ports": {
-                "12": {
-                  "kind": "switch",
-                  "uid": "sgriffonib"
+                "42": {
+                  "kind": "node",
+                  "uid": "node-mapping-undocumented-for-this-ib-switch"
                 }
               },
               "rate": 20000000000,
@@ -159135,9 +159103,9 @@
               "kavlan_pattern": "%LINECARD%/%PORT%",
               "kind": "switch",
               "ports": {
-                "12": {
-                  "kind": "switch",
-                  "uid": "sgriffonib"
+                "42": {
+                  "kind": "node",
+                  "uid": "node-mapping-undocumented-for-this-ib-switch"
                 }
               },
               "rate": 20000000000,
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
index 79e252ddbcc5cae8e9255c787d1ce6d04b13cd8f..5966476e83d2572754a2c117707dea441e7692e0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
@@ -116,7 +116,6 @@ nodes:
         rate: 10000000000
         version: MT26418
         vendor: Mellanox
-        switch: sgriffonib
       ib1:
         driver: mlx4_core
         enabled: false
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index 377c9fd4e29b4aeadb85b1b679a4b75117770360..9ed64f8f7dbc54006bd18c96f533f383fdc1cfae 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -28,6 +28,6 @@ sgraoullyib:
       kind: switch
       rate: 20000000000
       ports:
-        12: 
-          uid: sgriffonib
-          kind: switch
+        42: 
+          uid: node-mapping-undocumented-for-this-ib-switch
+          kind: node
diff --git a/input/grid5000/sites/nancy/networks/sgrapheneib.yaml b/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
index 33340aac888a7d65bbe1c99e4677689c82d8a444..686c8f7e4d3f670839bb3109619bfca6737f7dd7 100644
--- a/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
@@ -18,6 +18,6 @@ sgrapheneib:
       kind: switch
       rate: 20000000000
       ports:
-        12: 
-          uid: sgriffonib
-          kind: switch
+        42: 
+          uid: node-mapping-undocumented-for-this-ib-switch
+          kind: node