diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
index b6f90aa3e8ef266181f1c8df58378ffd532d3521..ec3e767c204c6adb991f37e022d1b212364f0c2b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-11.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/11",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
index 85a8630abed9a363bb89b6be2fffd4e0df059fae..bd8d29e9ad6356cc7c601f58703aa90f8d5bc38d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-12.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/12",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
index 24309e9d8b6d244528b712a814929d26ec75de77..8302586f1a8e549867667fec663b0496d82282d8 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-123.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null,
+      "switch_port": "Gi2/23",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
index 88d99928522a9da4392314458fc5aa9be20ea3df..56cf1f94956b57db2959da9a37fc4a56bc59aeac 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-129.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null,
+      "switch_port": "Gi2/29",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
index 3875b3c88a8606c4718040b9a32a42bb2106bdc8..638091138756d189a46e5005084048827e38b1a4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-27.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/27",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
index 455ed21d97617c6d8ff9966e3724faf125ba849e..165cf843851a94b6ddb7838b15d8e01d5b0cb13b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-33.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/33",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
index 50345b9c6add0cc5f00241aa0a7bc11b2a14cf9c..37cee6b4224483d479b701b83adce3288a09a414 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-37.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/36",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
index efdc69b8330400e1ce088328306d945a6ae410b3..b691f9a8877d28273f3b077a6f69dda7b9bfedb2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-4.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/4",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
index 331a9b57942c4a63a7a2d8e5e1532cb20ee22df8..4826138702a9116ce139a393e2188f3b342a5089 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-42.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/2",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
index 95dc039d3d298bdddc098671cf1e8ee453cec03a..4736e85faf6e7b34418590a592ebc7f6706740bb 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-43.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/3",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
index 6eb9b3fc9e65af7135933419d71e76ca5ea8aff6..65bb03a17e188c68205367e53af5ce7db2764c0f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-45.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/5",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
index d9cfe93db0487e462170e4d954ea31fcac12e18b..e2edbe60add8e28c7df79e55435102980db0e09f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-47.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/7",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
index 7e866a9eaa3704bb84b955e01830940e064209ff..9b014d155c656e3b199f1b161b7f93fc91208faa 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-48.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/8",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
index 0be88b8257107f243a71d6028f890e5db58691d0..56d74705957456ee45f85235d07c67aa0ed25ae2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-5.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/5",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
index 25ee90c2bbfee02d52c8a6eda14b83dd33b2bc69..6df71bedda9b81488ea83d7c650b232cfe21b653 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-6.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/6",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
index 54d1675af683d684f2a16742f7ed67686eff95d6..ba4c0b6ff35276082c2c06654eb6faf5dbbae158 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-60.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/20",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
index 9801c92f704a989abb0d98997b673c63da3d1bc1..2108d12320f8bdd5229eb5c6017bf96d35e483dc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-61.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/21",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
index 7982db54613c1819acc90399d6b3b19e3f05a810..7a14fed7e7be5dad757afef6075505eed0690b4e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-65.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/25",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
index f0dd97cb59df30c6f7003501a6813318e22d9882..acd4a4eb704fa86d95ba9a301c69ce9c6b1c0b85 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-69.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/29",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
index d07b69868531b0a5897831d1d58ecf69c0af8a85..c289e524875403bdee856023fc5e3b9ab9a47ec3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-7.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi1/7",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
index fa9a23f540d8367eea58dabe67766fef31692c93..4c4f5b140ad32d8bd19ca0b53080c5e25c4ec490 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-70.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/30",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
index e0475f10364facf986b831230239bd43392b07c3..83a7469825df7e58428e049b1a2b30e1704af86f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-75.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/35",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
index e17d0dbfd2ad3a7d94c18d0644136daa088cfba5..f498576cef5ab213dafc852be06789b85c6e5a9d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-77.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/37",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
index 0dd9f8218a4532b50497145133f031d309ec7c70..1b759852134ef57c6c3dcd85acd5465ae2c61e67 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-78.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
-      "switch_port": null,
+      "switch_port": "Gi4/38",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
index ed3605338bd26ca7b8c29e1155db335ec950cdd3..5ed722a2e4e2e4cd63961a56363d89396dcbfd3d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-81.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null,
+      "switch_port": "Gi2/1",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
index 99b47a502b01ec23974db4987450260076929b22..ebe74ac3bff4b9241a3a2729b9b84efe12f9b855 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-84.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null,
+      "switch_port": "Gi2/4",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
index 080babf974faf3c0aa87322a064c4b0f9551a0d1..3f1580b3a85d44cf9405d58d12ed0aadb5051709 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
@@ -24,7 +24,7 @@
       "network_address": "pastel-87.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "switch_port": null,
+      "switch_port": "Gi2/7",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/generators/input/sites/toulouse/clusters/pastel.yaml b/generators/input/sites/toulouse/clusters/pastel.yaml
index 958d551b4f97ec2f1b56f51398258524d1ed0ee5..2df049f817350480b52b541fa34e56493cf39d04 100644
--- a/generators/input/sites/toulouse/clusters/pastel.yaml
+++ b/generators/input/sites/toulouse/clusters/pastel.yaml
@@ -92,7 +92,7 @@ pastel-4:
       mac: 00:16:36:E0:7E:D6
       ip: 172.16.112.4
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/4
     eth1:
       mac: 00:16:36:E0:7E:D7
 pastel-5:
@@ -116,7 +116,7 @@ pastel-5:
       mac: 00:16:36:E0:78:2E
       ip: 172.16.112.5
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/5
     eth1:
       mac: 00:16:36:E0:78:2F
 pastel-6:
@@ -140,7 +140,7 @@ pastel-6:
       mac: 00:16:36:D2:EE:F8
       ip: 172.16.112.6
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/6
     eth1:
       mac: 00:16:36:D2:EE:F9
 pastel-7:
@@ -164,7 +164,7 @@ pastel-7:
       mac: 00:16:36:D2:EF:38
       ip: 172.16.112.7
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/7
     eth1:
       mac: 00:16:36:D2:EF:39
 pastel-8:
@@ -260,7 +260,7 @@ pastel-11:
       mac: 00:16:36:D2:EF:48
       ip: 172.16.112.11
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/11
     eth1:
       mac: 00:16:36:D2:EF:49
 pastel-12:
@@ -284,7 +284,7 @@ pastel-12:
       mac: 00:1B:24:2D:F7:13
       ip: 172.16.112.12
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/12
     eth1:
       mac: 00:1B:24:2D:F7:14
 pastel-13:
@@ -644,7 +644,7 @@ pastel-27:
       mac: 00:1B:24:2D:F8:37
       ip: 172.16.112.27
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/27
     eth1:
       mac: 00:1B:24:2D:F8:38
 pastel-28:
@@ -788,7 +788,7 @@ pastel-33:
       mac: 00:16:36:E0:79:5E
       ip: 172.16.112.33
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/33
     eth1:
       mac: 00:16:36:E0:79:5F
 pastel-34:
@@ -884,7 +884,7 @@ pastel-37:
       mac: 00:1B:24:2D:F6:47
       ip: 172.16.112.37
       switch_name: r4
-      switch_port:
+      switch_port: Gi1/36
     eth1:
       mac: 00:1B:24:2D:F6:48
 pastel-38:
@@ -1004,7 +1004,7 @@ pastel-42:
       mac: 00:16:36:E0:79:6A
       ip: 172.16.112.42
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/2
     eth1:
       mac: 00:16:36:E0:79:6B
 pastel-43:
@@ -1028,7 +1028,7 @@ pastel-43:
       mac: 00:16:36:D2:F3:9C
       ip: 172.16.112.43
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/3
     eth1:
       mac: 00:16:36:D2:F3:9D
 pastel-44:
@@ -1076,7 +1076,7 @@ pastel-45:
       mac: 00:1B:24:2D:F6:9F
       ip: 172.16.112.45
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/5
     eth1:
       mac: 00:1B:24:2D:F6:A0
 pastel-46:
@@ -1124,7 +1124,7 @@ pastel-47:
       mac: 00:1B:24:2D:FA:3F
       ip: 172.16.112.47
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/7
     eth1:
       mac: 00:1B:24:2D:FA:40
 pastel-48:
@@ -1148,7 +1148,7 @@ pastel-48:
       mac: 00:1B:24:2D:F6:AB
       ip: 172.16.112.48
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/8
     eth1:
       mac: 00:1B:24:2D:F6:AC
 pastel-49:
@@ -1436,7 +1436,7 @@ pastel-60:
       mac: 00:1B:24:2D:F6:3B
       ip: 172.16.112.60
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/20
     eth1:
       mac: 00:1B:24:2D:F6:3C
 pastel-61:
@@ -1460,7 +1460,7 @@ pastel-61:
       mac: 00:1B:24:2D:F7:C7
       ip: 172.16.112.61
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/21
     eth1:
       mac: 00:1B:24:2D:F7:C8
 pastel-62:
@@ -1556,7 +1556,7 @@ pastel-65:
       mac: 00:1B:24:1D:EA:9A
       ip: 172.16.112.65
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/25
     eth1:
       mac:
 pastel-66:
@@ -1652,7 +1652,7 @@ pastel-69:
       mac: 00:1B:24:2D:F9:F7
       ip: 172.16.112.69
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/29
     eth1:
       mac: 00:1B:24:2D:F9:F8
 pastel-70:
@@ -1676,7 +1676,7 @@ pastel-70:
       mac: 00:1B:24:2D:B6:23
       ip: 172.16.112.70
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/30
     eth1:
       mac: 00:1B:24:2D:B6:24
 pastel-71:
@@ -1796,7 +1796,7 @@ pastel-75:
       mac: 00:1B:24:2D:F6:EB
       ip: 172.16.112.75
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/35
     eth1:
       mac: 00:1B:24:2D:F6:EC
 pastel-76:
@@ -1844,7 +1844,7 @@ pastel-77:
       mac: 00:1B:24:2D:B7:1B
       ip: 172.16.112.77
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/37
     eth1:
       mac: 00:1B:24:2D:B7:1C
 pastel-78:
@@ -1868,7 +1868,7 @@ pastel-78:
       mac: 00:1B:24:2D:F6:B3
       ip: 172.16.112.78
       switch_name: r4
-      switch_port:
+      switch_port: Gi4/38
     eth1:
       mac: 00:1B:24:2D:F6:B4
 pastel-79:
@@ -1940,7 +1940,7 @@ pastel-81:
       mac: 00:1B:24:2D:F8:2F
       ip: 172.16.112.81
       switch_name: gw
-      switch_port:
+      switch_port: Gi2/1
     eth1:
       mac:
 pastel-82:
@@ -2012,7 +2012,7 @@ pastel-84:
       mac: 00:09:3D:12:80:91
       ip: 172.16.112.84
       switch_name: gw
-      switch_port:
+      switch_port: Gi2/4
     eth1:
       mac:
 pastel-85:
@@ -2084,7 +2084,7 @@ pastel-87:
       mac: 00:16:36:E0:78:9A
       ip: 172.16.112.87
       switch_name: gw
-      switch_port:
+      switch_port: Gi2/7
     eth1:
       mac:
 pastel-88:
@@ -2948,7 +2948,7 @@ pastel-123:
       mac: 00:16:36:FF:D3:6E
       ip: 172.16.112.123
       switch_name: gw
-      switch_port:
+      switch_port: Gi2/23
     eth1:
       mac:
 pastel-124:
@@ -3092,7 +3092,7 @@ pastel-129:
       mac: 00:1B:24:3D:E4:A5
       ip: 172.16.112.129
       switch_name: gw
-      switch_port:
+      switch_port: Gi2/29
     eth1:
       mac:
 pastel-130: