diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
index ce58b5aa04ae2418d585af91750b46780e8360bd..0c2a8e59be8e0f03cfb254dce26e6db3b9229ebf 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-1.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/3",
+      "switch_port": "GigabitEthernet4/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
index aecfcc0f8e5fb498ffdc03f6caec9c071df8effe..d34c4554744740d5da774c8189ad97b37e5db5e2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-10.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/6",
+      "switch_port": "GigabitEthernet4/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
index 4213e441b9512c4a5d53e3a90c925a66a4fd5d50..6039fec054fa68daa7dae3476d75c5148c6cea30 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-11.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/13",
+      "switch_port": "GigabitEthernet6/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
index 70a67979796c790528ec74cd28d231dca41d4100..11d016c311aef278e655baaa41843e3ce48ce702 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-12.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/14",
+      "switch_port": "GigabitEthernet6/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
index addd24bab7ad51d0a0bc1a31dc12a8500d1455b3..784013f3d36d4b1783293725ac0702ccd2867a61 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-13.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/19",
+      "switch_port": "GigabitEthernet6/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
index f5c2a32c0d455b01ece5edda1c4c029b00367383..6eed35ca8e6bf13f76da2b9da3596327a197c7ec 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-14.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/11",
+      "switch_port": "GigabitEthernet6/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
index cff8bf0a7ec926f73d0b37b94d93e8a948b70e94..cc6ef23fef88b9b90cb4a6860c6d61fa5f9e6617 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-15.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/15",
+      "switch_port": "GigabitEthernet6/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
index 68a109ec2d604b5fcf77c788373f3598ee936f48..06c2142bfa8851b0c0d9400ff4a45568e5b6a27e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-16.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/16",
+      "switch_port": "GigabitEthernet6/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
index 40098a2f91f8c3f3d8804bd31ccf1d24009c0e55..f83bfe78ae7f10d83679ff2291f7d0dc24204dd4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-17.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/20",
+      "switch_port": "GigabitEthernet6/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
index 72778ef3832418fdcf8bd4c8792c24ea95d208cf..a353cd49af44ae78f9a95edc62d6945980c63cc9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-18.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/12",
+      "switch_port": "GigabitEthernet6/12",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
index ff3cf8f25aebc41030270bdf420791b46846195f..c1b41c64a0c9e43ea93c4b74652b4487bc079975 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-19.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/17",
+      "switch_port": "GigabitEthernet6/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
index 0cdf02127c9d457a6fc1a145a995ba07f49f1f5a..9ad2853bf0c959bce7e6a9f40e068e9c489a528d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/2",
+      "switch_port": "GigabitEthernet4/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
index e0b3c79bbd7a38c0fb23ef4d8008a88f3a89b439..e3627266ecc53a7a15a6f58f1f70b34e7a133452 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-20.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/18",
+      "switch_port": "GigabitEthernet6/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
index 37f289ac22d98f28fe3e180e442d7baac144bcde..5e10c7e05d09c14e2e6f1507fdc6e4e235b47374 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-21.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/7",
+      "switch_port": "GigabitEthernet7/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
index 39edc06a430874ae8e0ac8f5e7b6831419050c9a..cba6a5cf6de482d9122f93ebad83927f7dc09424 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-22.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/10",
+      "switch_port": "GigabitEthernet7/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
index ac0e604fad09ea761293dc1d1ecfb238c7ebe2fa..66f4d6eaa633bad692426c92369b76972225f5e8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-23.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/3",
+      "switch_port": "GigabitEthernet7/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
index b299fe3e0103f2ecf3581b1427041ca9fce2ec9b..a3715e5ed43fc913214eed085ee50a20560338d6 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-24.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/6",
+      "switch_port": "GigabitEthernet7/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
index 48778156c170a7a8c5e4f6e7d318b3729527affc..b95906deb808ae6c71c47e59f06434bd9fbdef07 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-25.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/4",
+      "switch_port": "GigabitEthernet7/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
index 37bb0edc18bd6590931f7a80ef144fb6cf8d621e..5759c4abff94903ce42cfac7cdf68d3e2adc8867 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-26.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/1",
+      "switch_port": "GigabitEthernet7/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
index 75051258f48bb3ed3d54dbbd2fbbeeb569e462fb..51be84049c7ea4a216bc093322609ae5c58b4d6b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-27.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/9",
+      "switch_port": "GigabitEthernet7/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
index 7006ec1cb42db2fba5951594ed4c3a4215b214df..14f3a406f192f1c57861ff34ba13a34f12d4b38d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-28.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/5",
+      "switch_port": "GigabitEthernet7/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
index 9147f0477913da8ce3d3a8aa141b9e9a33c969c9..6a272fbb4b24c2c50da78df9618bea924b4c3882 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-29.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/2",
+      "switch_port": "GigabitEthernet7/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
index 623bdeb96af515759885e9b8a2665fef0d3cd58f..fe93dea3e26fe27cea88b49f1e0e8b1bc0b32034 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-3.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/7",
+      "switch_port": "GigabitEthernet4/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
index 855eee9caa4538cb3b6126aca31134d6435bd523..5cdb50df54e1017690da66d6e96e307b70e8e9d4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-30.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/8",
+      "switch_port": "GigabitEthernet7/8",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
index 8e52d351f3f0431254472b8509e5225042a41731..7ba9b34d511386cb4526f4a9e410c20459adafc2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-31.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/15",
+      "switch_port": "GigabitEthernet7/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
index 217f8b17de0f6fd7e71e00bbd29b66d130c0650b..e0d54d7fc051f772691fc4b3cceefc108887df9a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-32.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/16",
+      "switch_port": "GigabitEthernet7/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
index 441c42ae236b1f7cff8b1f71472e19dd07798d2e..154eccedcf02a05cde93013102caf244d104c4d1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-33.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/20",
+      "switch_port": "GigabitEthernet7/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
index f6afcb969427a2cc42f27caf695d205ad7c74885..29f3a23f3470dd3584821e81ecab650189036b52 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-34.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/19",
+      "switch_port": "GigabitEthernet7/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
index ef90ed6a6be64eb104434f542303e594b61c9c21..8d1a3fc99b8456537d74a6802438742eb427fd78 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-35.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/17",
+      "switch_port": "GigabitEthernet7/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
index 567bfc7ad4fe86ec4cbdd0a6d2524bbf14230dbe..8a274a41b1dceb7ca57ff1d3462fce1b83cf2b38 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-36.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/11",
+      "switch_port": "GigabitEthernet7/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
index fe92f19a663ce39cba17232c0fbd8407d42a1fe3..92fd8e335d053c898906375288a85e4356f65e25 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-37.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/18",
+      "switch_port": "GigabitEthernet7/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
index 1c7c2bf59723b20f583d2f82576c02d4b76eac52..bb50fa623253fe3fa5632753917a381bffd5071c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-38.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/13",
+      "switch_port": "GigabitEthernet7/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
index 3e1d6852b6139aa23b37b247a7273e9986d35dcc..7dc21bc8063005571f692b804a76c9f9edeeed1b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-39.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/12",
+      "switch_port": "GigabitEthernet7/12",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
index 9536f30f4c6c2cfc5e999924e0711b9ecb7a74d6..31315b11e91afc886c2b446de1ca775c741056ff 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-4.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/5",
+      "switch_port": "GigabitEthernet4/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
index 2d498d1f41cf0bd1b36c085f316c1b695f863653..e7063bf80d5aadc9dfb61f28e8520222faed793e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-40.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/14",
+      "switch_port": "GigabitEthernet7/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
index 7e27d19e9f2a0d74333d473f07987ebcd5493725..f42bdf50ab36b8eeb293438ef228e5dcc248c095 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-41.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi8/16",
+      "switch_port": "GigabitEthernet8/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
index a14c29d6fc581b57d35c37484869027eb74db454..e73c58010d6ace33cc3c96061a06b4d9447dc334 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-42.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/15",
+      "switch_port": "GigabitEthernet3/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
index 57ee3ceee7b1861728c3867a3fadb97cec819c4a..c6e56e3b05a5cd5bc226b4fe7556c9d464f5cd66 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-43.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/22",
+      "switch_port": "GigabitEthernet4/22",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
index cb774086e13702dd76967be7fde6ddbff0dfb314..931f5ffd49f628985289f34466ee94c443e7b658 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-44.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/1",
+      "switch_port": "GigabitEthernet6/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
index c7b7ff2f25541c87e17cbb45ce7f45a9384ea538..059e7d3b8b9f40edfdd50aeec4977ea8c52035c1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-45.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/6",
+      "switch_port": "GigabitEthernet6/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
index 17f3673e4113a3300254125e94013bf81d7c6490..a430bbc522f10285963caacf53c14803f7a13d70 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-46.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/11",
+      "switch_port": "GigabitEthernet2/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
index c4819e86e38955a8141eb4a7c0420cb01c245126..e50b71f5578b1806362d8d5f75ba68502d8a10dc 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-47.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/5",
+      "switch_port": "GigabitEthernet6/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
index acec758347f7d835ac2269c0c5c3ce96edb4f195..1fb3798505de0f708d6e069cea3bb399128704f4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-48.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/4",
+      "switch_port": "GigabitEthernet6/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
index 09b788b43faab996b66b1608b67789c7f00dd116..73401fbdda6c761d6aef34fda7f2fdf3b468f208 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-49.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/3",
+      "switch_port": "GigabitEthernet6/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
index 5acd9979edeca3bd3f88f78297b008b1da6e6d58..399c59b72260959f0cc4802bc382a3ee92c703b8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-5.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/9",
+      "switch_port": "GigabitEthernet4/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
index 7f61ba1ae2451bd24609f36e06374eb543995fda..80138b5420f844369bced2c3147e374aa3aa82b8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-50.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/2",
+      "switch_port": "GigabitEthernet6/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
index 132ed1f48a7c689c9f2667c8fa0d46f2ced3d725..07593d08294b7e72391a15a2216c5e4678e2785c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-51.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/10",
+      "switch_port": "GigabitEthernet6/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
index 50203bd4289df43dcd0a13f15a6ab25740e26d9b..92c46862f1dcb179475d6a7c85d195d616b6dfb1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-52.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/9",
+      "switch_port": "GigabitEthernet6/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
index d153277d88895cf52763782a308c0d72374425f9..0002f16f4c17e26c88cc5e6608024d8c9d85b791 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-53.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/7",
+      "switch_port": "GigabitEthernet6/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
index 775e695759aea81e5e1092967bede0c2d1fae1bc..ae49c2a9e079858aa98572c94e4159d7148ea8ae 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-54.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/18",
+      "switch_port": "GigabitEthernet4/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
index c284e5b5ba223fa35da74aca10e41b38d10bdfdd..0362a0cde1f483cdd0d8e0588fcba4ba72605d29 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-55.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/19",
+      "switch_port": "GigabitEthernet4/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
index 0f3e320b980120d222ada19dd46d9ada161b2f86..87ca0db7cb7406b2428a8d956b1d1e93fb15b9a4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-56.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/17",
+      "switch_port": "GigabitEthernet4/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
index 3095a500d95448c11abd10285583aa8135522bfe..66832df44cd0c4ed797e732b59aea6c19ed645ca 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-57.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/14",
+      "switch_port": "GigabitEthernet4/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
index 9108f01d9ce33402ef94f9e3d136ff3e31f9e31e..1592b5a281a41fba68fd83f4f0b4cab53665ffbd 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-58.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/15",
+      "switch_port": "GigabitEthernet4/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
index f9db3893f417450a25aa8dcb6214b1f604f36a71..b5c4a1dd3c0bf6dfcee7b31d2a9fbf4035fbbbb3 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-59.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/13",
+      "switch_port": "GigabitEthernet4/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
index ce1051976ededdade128143adf74252d4b8a22de..56445b6117445500b6e6876be68186db18ae4fab 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-6.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/1",
+      "switch_port": "GigabitEthernet4/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
index f5e8f817768c1f0e9a5954d2113d744263da88c6..55dd1bd580812e6adf756b1aded743fe8b383643 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-60.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/20",
+      "switch_port": "GigabitEthernet4/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
index 6fa02eec6db66a13f37865160a6c7ddf78876ba0..1254b67f2090e5042b3fd51621e4ba407f01a009 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-61.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/11",
+      "switch_port": "GigabitEthernet4/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
index 0e9f342424b5898026e6ef7593477fa4be37c6d3..68f6336ece26b39a341cc629dad281486daab388 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-62.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/16",
+      "switch_port": "GigabitEthernet4/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
index f6706b26f9b552b6dac099df2dc5177e37b484c8..d8957c885aade6559423cb7e254f275572ef4970 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-63.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/21",
+      "switch_port": "GigabitEthernet6/21",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
index 871bc9de40dcc33c9f5ef48fb6a0f4bfaf3523ab..1cae306ee2e0d0df550ec971739fcdb45b6056e9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-64.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/22",
+      "switch_port": "GigabitEthernet6/22",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
index 7c38c0a55ea7fcd72df3ee7516432a0646d9e39e..c3b85e28eebd311c0091056418544f8baa49087f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-7.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/10",
+      "switch_port": "GigabitEthernet4/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
index 350ab55ddac66cacb952e190d341dc7790d39560..f0bec4e445de608756027a34a1ff004374605196 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-8.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/8",
+      "switch_port": "GigabitEthernet4/8",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
index 63fafafdad81393b39466a1c1cceb0037e13dbcf..356ca86f9cabb20b8aee54f298fbc7271ccda2fe 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
@@ -37,7 +37,7 @@
       "network_address": "paradent-9.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/4",
+      "switch_port": "GigabitEthernet4/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
     },
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 0cc2049a16cf0a1a605ad3a0df6d2deae2f0d9ea..d5874ee3958769292373ddaaed8e7cabcc252886 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-1.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/47",
+      "switch_port": "TenGigabitEthernet 0/47",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/3",
+      "switch_port": "GigabitEthernet3/3",
       "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 5d614ff294ef43ccebb64dcd8aec897c046d77da..435aa770a9f04c143a8f4d54e0a47738d69ab9e9 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-2.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/46",
+      "switch_port": "TenGigabitEthernet 0/46",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/9",
+      "switch_port": "GigabitEthernet3/9",
       "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 836300c6976b377d88fba9a369aa1c907016c5ed..7bad0362038f700162067add84e15b3f9651f8ff 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-3.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/23",
+      "switch_port": "TenGigabitEthernet 0/23",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/3",
+      "switch_port": "GigabitEthernet2/3",
       "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 743bfbb347abfdd5fa84b3d7db91ed7e752fca1f..0a47fffc14b1a75548d9291fadda481c231b3fdb 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-4.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/22",
+      "switch_port": "TenGigabitEthernet 0/22",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/1",
+      "switch_port": "GigabitEthernet3/1",
       "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 810a9a74983dbdf9e798f8055c16a53f3eb26a22..91d26a6ec27c543c676975a81d4f779d530cd3c3 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-5.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/45",
+      "switch_port": "TenGigabitEthernet 0/45",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/7",
+      "switch_port": "GigabitEthernet3/7",
       "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 68e1a548c460f4e11d0621f6f9912f2ba469511e..36b4a9552efc0977cc89088c5892405d540a7866 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-6.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/44",
+      "switch_port": "TenGigabitEthernet 0/44",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/10",
+      "switch_port": "GigabitEthernet3/10",
       "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 5303f470d694406204436a1726889204f183aea0..3e5f34062922ff8d6fc044dae852f8c1621b5e57 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-7.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/21",
+      "switch_port": "TenGigabitEthernet 0/21",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/6",
+      "switch_port": "GigabitEthernet2/6",
       "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 8b190fd21212cf0c546899a0fd30a94a81ee5b41..c034fe50038ed7f9a066b53e873879c79390f11d 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -39,7 +39,7 @@
       "network_address": "paranoia-8.rennes.grid5000.fr",
       "rate": 10000000000,
       "switch": "bigdata-sw",
-      "switch_port": "Te0/20",
+      "switch_port": "TenGigabitEthernet 0/20",
       "vendor": "Intel",
       "version": "82599EB 10-Gigabit SFI/SFP+ Network Connection"
     },
@@ -69,7 +69,7 @@
       "mounted": false,
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/13",
+      "switch_port": "GigabitEthernet3/13",
       "vendor": "Intel",
       "version": "Intel Corporation"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 9c9a186b6456861fee2ace98aac5603661ab6f92..43561a5f163af726d42ee9e72b39e2da2d76807b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-1.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/47",
+      "switch_port": "GigabitEthernet7/47",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 9b107660d19a9dd54a48f1d3af3e707de6c13fda..00bba730968bc97bd382fa23f0f91c824aa1d442 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-10.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/43",
+      "switch_port": "GigabitEthernet7/43",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index d134655b395eec9a7e441762f99a7ef1e2107ff4..2f1ff787b0b52743ab5f3b0ae8e663c563908dfd 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-11.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/45",
+      "switch_port": "GigabitEthernet6/45",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index c12cbcb9d2762eb61bbbcab3c3a54d9f7adf2bd2..abbcd5a147b669c209b2631f3858119d236b02ac 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-12.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/48",
+      "switch_port": "GigabitEthernet6/48",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index b658344347cb59e23fe61893a9f34e70fea2c4e7..22c457ec066cb0f45201ec5b91c799fb329cfe84 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-13.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/47",
+      "switch_port": "GigabitEthernet6/47",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
index 7836f713c94dd7e86e641f48b9778c4bc90d3bab..51ae7c54b80e4c9cbbde9c2317f36a22b8973a89 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-14.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/44",
+      "switch_port": "GigabitEthernet6/44",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index 5690dc4d15abc862ae9f995950377a3c47fc9427..dcb5617361689f66a9d7f8b0eb1adebbee73908c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-15.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/46",
+      "switch_port": "GigabitEthernet6/46",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index 3ef9357cda6ff84ce833393ec37304efb2457157..5ba627cfd3b74e007703bf055a89311ab000a92b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-16.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/42",
+      "switch_port": "GigabitEthernet6/42",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
index 6b9ba064c41a8380ef0224302b13e3144c26486d..f47a21b4dab5d08f22e64d5b143ecf6f7723e501 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-17.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/41",
+      "switch_port": "GigabitEthernet6/41",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index cfaf37ac075b1bee3b2676f34b791457df7c9316..8b7e5445c6f3a175145b7304671d0ce18dff5489 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-18.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/39",
+      "switch_port": "GigabitEthernet6/39",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 3466f2b428bab9d6269d185a836758d6e30e4182..6afa416e60d6ecda1726dddc9662462fe25d2ac5 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-19.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/40",
+      "switch_port": "GigabitEthernet6/40",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 7b2e1f01444a6cf3d4b6d490a6e9fad6b036cc1a..f4cc48e756d342e2e41be5b547258189eff2ff84 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/48",
+      "switch_port": "GigabitEthernet7/48",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 7f66db5785e0adf27e53ef9c30d5b321a2c3f1a9..560b2a0a20a93c8efecb1cea1575c755bb6275c2 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-20.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/43",
+      "switch_port": "GigabitEthernet6/43",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 896319903690475dc187c8dbcc7ce419214f3086..1d1de6b854401f5b3bd0709a45ad9a287ba7a389 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-21.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/36",
+      "switch_port": "GigabitEthernet7/36",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
index 395c39624f0f58e8454ecd123aa3e3920ccc3aaf..c2f83f0c2b2d6ef8caa5ad158bbe00746ef50b03 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-22.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/38",
+      "switch_port": "GigabitEthernet6/38",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
index 2e7c5e4305c8917fbc72a554ead9952c6bcd46cd..ba8c33ea91e944c84c7880e1f0f9dd7a2e26033e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-23.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/37",
+      "switch_port": "GigabitEthernet7/37",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index aa0e9de2483cf5cf915f4804926ef93b4c326752..c739026659485e1cf5ae76a89a486a3ad68114b2 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-24.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/37",
+      "switch_port": "GigabitEthernet6/37",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 9ef7502be113f56be4df4d31ce177b83d2a701e4..6b0384b559e2318642250b1f5803b6fee95b0a10 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-25.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/38",
+      "switch_port": "GigabitEthernet7/38",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 2001de2a62171328a152dc1aa14d64b7ffd84e24..bf104a62c683057e1e88ce50c2dab34664e9b1b8 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-3.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/34",
+      "switch_port": "GigabitEthernet7/34",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index 0385d9c7436edd72e4e4c9ddceef3d96e796690d..579549413048f84fc1eb7d95b9e6727918335352 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-4.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/46",
+      "switch_port": "GigabitEthernet7/46",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index ffd0f406a64c0de02aaa1119e224ef1af28539e5..19dd2324e5b99be7876d9302d696a4daefc98708 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-5.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/44",
+      "switch_port": "GigabitEthernet7/44",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index 0ee75e575494505164420c8c5992ed9ff0c7630f..f363780a31b842566c092fab8c02d59bca2ca11e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-6.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/39",
+      "switch_port": "GigabitEthernet7/39",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index 83ed2bea4bfc1fb52ac5048eaa91ec353daef7ba..a0a97fd2ddf523565faa601a67323824474b9e13 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-7.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/40",
+      "switch_port": "GigabitEthernet7/40",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index 0116a7f7f3fb8fc2f3538d27e748d32656cf91dc..7520cb69be28056551a91acfc148cab165b8dfc5 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-8.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/42",
+      "switch_port": "GigabitEthernet7/42",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index c392451366a4dcccfae8344c5cc4fc8f06f104e1..160831b18173ff4da27b3c3af7922d5e63dc0180 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -41,7 +41,7 @@
       "network_address": "parapide-9.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi7/41",
+      "switch_port": "GigabitEthernet7/41",
       "vendor": "Intel",
       "version": "82575EB"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index abe363bac2199eef3adfc7b63a1a76d63e4398fd..b3c4a72f1cabf242b7b1eef26c6e54630b28b98e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-1.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/42",
+      "switch_port": "GigabitEthernet3/42",
       "vendor": "Intel",
       "version": "82576"
     },
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 71075235fbb6a4e7c8a90f49d57ee1666d453bda..77f42817faffd8a1ecf027391628fc5df98796ed 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-10.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/31",
+      "switch_port": "GigabitEthernet2/31",
       "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 13717aa3070448e7c201cd6dfec7ba66851dd6a8..7791e9a7772832288e064a0d2eaf1a137cb72d92 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-11.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/40",
+      "switch_port": "GigabitEthernet2/40",
       "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 c1b1879b5b91a642258a5108cca50387bcb614c0..d6f9e016745ec28f353e5e9f811360f0e0958d64 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-12.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/41",
+      "switch_port": "GigabitEthernet2/41",
       "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 e5303e19b7c1be4f02a0efb997debf0717a0a8ea..fdf0d31eae485cfbc3167ef0e00bc2c44644e9a7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-13.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/37",
+      "switch_port": "GigabitEthernet2/37",
       "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 039501544bd5a4b1577ffd3a90c79697ddab1f71..5e8a559b0f5909adb3522b924ee858e59065d7cf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-14.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/38",
+      "switch_port": "GigabitEthernet2/38",
       "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 628b4e8a9c830d4d3529a35c8f1c4bf03f4c01e2..7741b15e7bad45bfdeccb243a5303f23afdd5cb2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-15.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/39",
+      "switch_port": "GigabitEthernet2/39",
       "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 9b91e3168f7a90ea0e4b7ff46c36a1921a09e320..3a5d7488d85a059f005c717040c118e9cdd9fe32 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-16.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/44",
+      "switch_port": "GigabitEthernet2/44",
       "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 8eb13f24a237a84619842b39635e9308b092d705..5ae700e01304242835cd71a8ba5e7e0d88e51f1b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-17.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/46",
+      "switch_port": "GigabitEthernet2/46",
       "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 bd8e9f409bc67201160642de0652d8f1ad8615f2..5ba82c8ee08ebfff5173240401aaeb6a86066484 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-18.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/45",
+      "switch_port": "GigabitEthernet2/45",
       "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 ad9f5013ee2b635b2f1c4da54242378b43ce98ac..987cd38355be3563e7b451fb9b42912742d1bdf7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-19.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/42",
+      "switch_port": "GigabitEthernet2/42",
       "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 9e0e903601873dae5f836d98084cb4c2c5b77f13..40a22508b717c98bbcb63d17d38ce5546463c4ba 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/32",
+      "switch_port": "GigabitEthernet2/32",
       "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 040f0ac36e7f65a4c91d9a9a515c96a07c1430aa..71462f6edaabfa77b791c379f4054e67156309b2 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-20.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/43",
+      "switch_port": "GigabitEthernet2/43",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index ae4005308c5a17b0390e6e8e708480db25ce083f..c2af049bf1b57db9ba1f876037182f0e443f96d4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-21.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/47",
+      "switch_port": "GigabitEthernet3/47",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 4166a1065e05e2739023f7701b7c7c851e2e2aee..6bc4a746c841152c62fe0fc9482bfc039e065523 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-22.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/48",
+      "switch_port": "GigabitEthernet3/48",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index 56360f5b9c5dc747ac1772e21a83849e6407671a..299135249fdcaef2248715ad24e9dbf7c08a5b68 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-23.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/46",
+      "switch_port": "GigabitEthernet3/46",
       "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 0664fcdfd282a47586e56d2d9d074fdd5e364aa9..35a9196ea5d65f72de973bb310f913b25f60e966 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-24.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/48",
+      "switch_port": "GigabitEthernet2/48",
       "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 33b523684edf663eb3703fe51d81f58c2838d265..8a102db3f564bf6f91912588e91d333f79445898 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-25.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/47",
+      "switch_port": "GigabitEthernet2/47",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index 004a91ed72d26b996b3b53c05eac7aa521848c6c..4ffb08f5bd83fa04a5d225762105cfb709e1e173 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-26.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/46",
+      "switch_port": "GigabitEthernet4/46",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index 50eb0f48d8b6ae930358365d02f44abb44e3f78a..74c41094097f7f9b6e584e0f2a73eb9a62845399 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-27.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/32",
+      "switch_port": "GigabitEthernet4/32",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index a729a2f2a0327d0e6f67078e2d5d4aeed565e623..7c5172b438ec00f66f2361d6a93def65b833868f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-28.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/31",
+      "switch_port": "GigabitEthernet4/31",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index d60f98739853059da0bbd981718f603bfc692566..ef739fb68653f5d145375dc24bca69d28e2776ba 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-29.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/48",
+      "switch_port": "GigabitEthernet4/48",
       "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 0acd783510e4f2826d644053b0507a3efb5a0214..8ecb31310cabd55590f9b34441aebd896aea5530 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-3.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/34",
+      "switch_port": "GigabitEthernet2/34",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index 474b3624f01aca6e96ef67a87a8bd192bb4b19dc..0396655d07f366d57d17a730a2a0b346d6be7aa6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-30.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/42",
+      "switch_port": "GigabitEthernet4/42",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index d03a92fac66bcc126fc8efee6313c3974968ed14..9cc04d87389625bd2e157124d641bdfe3f8da1a3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-31.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/41",
+      "switch_port": "GigabitEthernet4/41",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 4835c9ad2641b0d88b0eb1e3cd58c1cfc7047c52..fdf4a547070fb472c5660aaff7407c1b6172c98c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-32.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/40",
+      "switch_port": "GigabitEthernet4/40",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index b4d8e2a6823c187c48f9d73784ff6238b5b6a274..6d1b0169641677b4db0dee0c555ee79cec09c690 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-33.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi6/33",
+      "switch_port": "GigabitEthernet6/33",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index 137b081adb8ae854d8368383f9905e96fa34ad48..50264b59993669261c0ef4ac03e0d9aba0dec786 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-34.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/39",
+      "switch_port": "GigabitEthernet4/39",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 49eb22896b3cd5c58ce0514b9a04caad076d7af4..ca562621092ccf299fa8595673ad47296f83a212 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-35.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/33",
+      "switch_port": "GigabitEthernet4/33",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index f20301372e4de0c1613498e8b112c9abcb82d493..2acdfcb7f910382ed193191d24e495bf650d1731 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-36.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/35",
+      "switch_port": "GigabitEthernet4/35",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index abd2db120d20658068b05dbca7f63d4b511192cb..fae059935b10d2f3bb22de048386654d07a8e550 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-37.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/38",
+      "switch_port": "GigabitEthernet4/38",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 562b4ef28cd3d2a8e1ee3936a1229b42cc2a0fae..bfe553a0edeee7a50849c06ea1f2dcd4f08d1d8b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-38.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/34",
+      "switch_port": "GigabitEthernet4/34",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index c1a5e77a4ff70d972a5e960935420e174240de92..28f024b6dd587d6713d693514b1555eccca4ab62 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-39.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/36",
+      "switch_port": "GigabitEthernet4/36",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index fca39c2a1b2c1dd4c6edb9628cdb41382c928708..71a1e918425bc13c75491a1a66155b21bf2bfd6f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-4.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/45",
+      "switch_port": "GigabitEthernet3/45",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index 15eee2281dae52dacd4ec3ffb15b98885b26b2a8..361a9d9cfdccef082dbe7670ca1bac05fb87bc55 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-40.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi4/37",
+      "switch_port": "GigabitEthernet4/37",
       "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 4dcde68d680420b42c072a1cb2473c3db3fc85fb..8ab86a7b009ac4ad9b08254500360439603f72cb 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-5.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/29",
+      "switch_port": "GigabitEthernet2/29",
       "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 842fa88f1dbf2750095f58d23d90b5fe3c1db82b..6ae5cef7af6c97dfc18cebc252af5a486d681e98 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-6.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/36",
+      "switch_port": "GigabitEthernet2/36",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index 3af62b79f556e3f53cd86e7982d2d70002f305ba..a01b6fc56edd0bb0729b722ca1720a6c8834fc78 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-7.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi3/44",
+      "switch_port": "GigabitEthernet3/44",
       "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 e2273e011a20e559197e78cb4df7ace51fc71dda..f43f939d47127ba47b6775902da6135fcd262afc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-8.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/33",
+      "switch_port": "GigabitEthernet2/33",
       "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 318cd4e2f77b08157d63d26fd451ad1853f6d7ae..87d2381d48a219ffd83463e5ef958745be6594b1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -56,7 +56,7 @@
       "network_address": "parapluie-9.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-rennes",
-      "switch_port": "Gi2/35",
+      "switch_port": "GigabitEthernet2/35",
       "vendor": "Intel",
       "version": "82576"
     },
diff --git a/generators/input/sites/rennes/clusters/paradent.rb b/generators/input/sites/rennes/clusters/paradent.rb
index 7a3b43edec5008992e9fd14b6b29090fb82f2aa1..459b6d7dbea5d59ec924d63df190b98d1593e55d 100644
--- a/generators/input/sites/rennes/clusters/paradent.rb
+++ b/generators/input/sites/rennes/clusters/paradent.rb
@@ -96,8 +96,8 @@ site :rennes do |site_uid|
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip               => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :ip6              => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('paradent_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('paradent_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :switch           => net_switch_lookup('rennes', 'paradent', node_uid),
+          :switch_port      => net_port_lookup('rennes', 'paradent', node_uid),
           :mac              => lookup('paradent_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
diff --git a/generators/input/sites/rennes/clusters/paranoia.rb b/generators/input/sites/rennes/clusters/paranoia.rb
index 3e337ff17a1b7bcf83e7d3724edeea3183c5cad0..3286f1cb15a6c731a43654e1485b29a198939a6c 100644
--- a/generators/input/sites/rennes/clusters/paranoia.rb
+++ b/generators/input/sites/rennes/clusters/paranoia.rb
@@ -108,8 +108,8 @@ site :rennes do |site_uid|
           :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
           :driver           => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth0', 'driver'),
           :mac              => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch_port      => lookup('paranoia_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :switch           => lookup('paranoia_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name')
+          :switch_port      => net_port_lookup('rennes', 'paranoia', node_uid, 'eth0'),
+          :switch           => net_switch_lookup('rennes', 'paranoia', node_uid, 'eth0')
         },
         {
           :interface        => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth1', 'interface'),
@@ -139,8 +139,8 @@ site :rennes do |site_uid|
           :version          => "Intel Corporation",
           :driver           => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth2', 'driver'),
           :mac              => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch_port      => lookup('paranoia_manual', node_uid, 'network_interfaces', 'eth2', 'switch_port'),
-          :switch           => lookup('paranoia_manual', node_uid, 'network_interfaces', 'eth2', 'switch_name')
+          :switch_port      => net_port_lookup('rennes', 'paranoia', node_uid, 'eth2'),
+          :switch           => net_switch_lookup('rennes', 'paranoia', node_uid, 'eth2')
         },
         {
           :interface        => lookup('paranoia_generated', node_uid, 'network_interfaces', 'eth3', 'interface'),
diff --git a/generators/input/sites/rennes/clusters/parapide.rb b/generators/input/sites/rennes/clusters/parapide.rb
index 7ef01406f62678cb31de196f0d8c2d0cebff4a26..c9fbba1b4c05ec7031937b8b432c6c71f28255ce 100644
--- a/generators/input/sites/rennes/clusters/parapide.rb
+++ b/generators/input/sites/rennes/clusters/parapide.rb
@@ -77,8 +77,8 @@ site :rennes do |site_uid|
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip               => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :ip6              => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('parapide_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('parapide_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :switch           => net_switch_lookup('rennes', 'parapide', node_uid),
+          :switch_port      => net_port_lookup('rennes', 'parapide', node_uid),
           :mac              => lookup('parapide_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
diff --git a/generators/input/sites/rennes/clusters/parapluie.rb b/generators/input/sites/rennes/clusters/parapluie.rb
index 68f605fa53bb872527032c394af83d78404a506c..e74d30770f46b056d66d76dc1aead8d09a6365bf 100644
--- a/generators/input/sites/rennes/clusters/parapluie.rb
+++ b/generators/input/sites/rennes/clusters/parapluie.rb
@@ -91,8 +91,8 @@ site :rennes do |site_uid|
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip               => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'ip'),
           :ip6              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => lookup('parapluie_manual', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
-          :switch_port      => lookup('parapluie_manual', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :switch           => net_switch_lookup('rennes', 'parapluie', node_uid),
+          :switch_port      => net_port_lookup('rennes', 'parapluie', node_uid),
           :mac              => lookup('parapluie_generated', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
         {