diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
index 256260e00b92504411b54fee6af3b8590ef79a9f..491ee4bbd62be920fc25c93d2a1f445a33127bd5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-1.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/1",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
index ef52a99c5be3296676fef5becac9dbb850ce1faf..ef58cbe0cf85bc73d079e65f9c34d68488db4f77 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-10.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/10",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
index 0d556b20bebfc2f1ff5577fc7b45d9f809b04e62..de732495b34b9a757f9a22c7301205b0935cabfa 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-100.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/20",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
index bb795680b332e7fb0659fe94e7a5422c8972e2d9..34962f96f4ad0acd9dd3362731c71e02cbcdb37a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-101.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/30",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
index 82641e6416c514b1f6523c40a8ef032d039e90b7..47f132aa70fce382f21520f93ed0b62b5626e208 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-102.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/31",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
index 87b0dea887504f0b9c830b48217090cf9b1ee303..4af791bba627a83c463b639f7f65234d94c8b384 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-103.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/32",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
index 1c212da3f98137ad9657a7b16b6705b0b3419b60..dd11234b70dbfd361071b8e927acaad8e7f6b74b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-104.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/33",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
index 9ac20f50b74c6b11d9e5c7791f1f48e5d1416e62..7f265f5e723a70bcb34d888d5e685e492af3afcc 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-105.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/34",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
index c13a0f5dd7869ad08b2dd0a99eb11c689e4d6de5..27bdd07eea105bc10eac880e34f786d70e858b07 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-106.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/35",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
index d35ae1b373f9cec4fed60db451369301a86e153b..717b62943dbfbf79054c0e9c6d286e1eec6fe369 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-107.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/36",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
index 592fe9f8b4d60b0c3ef4f7fb4c1cd74e78f35992..c5c6f60e3df1320e6f4b6dddb9515bc66cab75cc 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-108.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/37",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
index 92ff922802fadb81e44a3fb38bb01daba1a39605..8e6cdaeb6acb27f57478b94997e86335c6d3de5e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-109.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/38",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
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 48f194f6a0e41686e94282f307d2e0c24248afdc..b6f90aa3e8ef266181f1c8df58378ffd532d3521 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-11.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
index 77ac35c74d4e1f7d473c64fd6ec5347ba05b4e0b..b94c222a671d3c51be702fbdda0f948dcafc9fc6 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-110.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/39",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
index bc8c630dced91cbb4600f79159130e7dc19fe96f..9f056a4f0517c0c57c98bd25b7a7fd4a0690d6d0 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-111.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/40",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
index 72cbb004f464aab903313b85a129cd43557d7e77..d480ba0120081be812e7e6bf422139f8eef3cbd2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-112.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/41",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
index 5610ee22dd628f4f21fc0218101e76a8cc588c08..63359fdc7df7b737f47635764f74770db7545856 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-113.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/42",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
index b416746b5a2e76f70d74af80b747891fa40b9ab9..00608913fbe2185b3b7ff6d141b7e85e2b8fd62b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-114.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/43",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
index 95ef14275936380c73e8a2b8321f0fc7a5f555d9..b130e37d9a179688b3720a4180a965f4fd70613f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-115.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/44",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
index 7a624fb2603447e213720655556c7012af56bf9f..8f30422ddfd5504ac825fac9e224e06a6688f4b8 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-116.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/45",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
index c505759acb1223b2f68c59315e636405d5b7f2d4..5e4f1c4a65508fa6ab2f97c6e032f6335163157a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-117.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/46",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
index 2bd9ad28261fc4c9323c270590cd749dd1b80eea..0c4ae6cffbe63e8fd3c0894406fb34077bac9441 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-118.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/47",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
index d5f3f0e75e1b31b57ad53e87ace67ef08eaaa2cd..bd6a787ba8c854ba98d4d5c668ef8fa012b067c2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-119.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/48",
       "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 5931913dc21900acba82b6de866a70de4fc3417b..85a8630abed9a363bb89b6be2fffd4e0df059fae 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-12.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
index 3196d8be19d13822435d6d6505bcb663eba82110..acc320dca9f596924d72b1f3049e1001e8605cab 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-120.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/1",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
index 41e01685f054a9f2f4510f0eb5dfb6d0ceeeb793..3f2502f00bf0a2f0275e5e597d15ccc6d0c15b5d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-121.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/21",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
index 8f6329f999de0e000b38c4cee16658c6ce217b86..642f3f95803cbf84d85e5008ebcb4a040861a09d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-122.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/22",
       "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 a2aac260841e15ac2a4e7c0806fc6af209ac1b8b..24309e9d8b6d244528b712a814929d26ec75de77 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-123.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
index 4f32506749fe1a019d0fbc400cdcefb5ffc86620..6a11d4a7709c99ab068baac78e5a80554599a29f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-124.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/24",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
index 0f9dec12016a08882232c3ce37d24013ccf4f22c..be4bf0c00fa30f53110aeb993380911dde27dc86 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-125.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/25",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
index e0b9fb5aa6df5e7383f959f98c3f10a29590742c..a0f203686dca4a2087828eccd01c9c91700dead2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-126.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/26",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
index 4f9910f9dc47849e98946e8f85c1210a408d61d7..89d98c187f8fe60a04a2a7af7e03198d043277a5 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-127.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/27",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
index fd2136b3fa1b362391c25e04de869156b449dd23..f79d78290ecf7b7ec89216c8ac12c4290725ecae 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-128.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/28",
       "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 80f56088e14c08874f14b9ce5082f7042aed683c..88d99928522a9da4392314458fc5aa9be20ea3df 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-129.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
index d03a3f0fde55e0e9737a75baf9fc2f20f6c9772a..07f4c1b6c286ae3ea43ea37e3e6c8f67bbcfd3a4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-13.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/13",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
index fdaad07359c32c664807d89fb29d55a634614747..ceecdeacaf5ff6c916d7eb445ad5fa986f13f604 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-130.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/2",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
index 0f78f07670ca54906128750fa518966feb63389c..8668c61313fc5a443eb916edd6c539f32548e5f7 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-131.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/3",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
index fbaad225b3a1754cdfd5cc6e553207b1e667c5d8..d9ed08ffba8223366a3379bba57e420d1fc2621f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-132.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/4",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
index d32c53a7f439617c577ce06b627b7d2df2f67306..757c29c5fb92b0f482aa1308c1da82ca610afb40 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-133.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/5",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
index b15bcaa8fea2b3225afbb39478fc43fec0f9491e..31ceaf7fb4edd21c5cbbfa64be9dbeec8f2223ff 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-134.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/6",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
index d943c7ccaa9efc2f1108331839fb321b60a0a3f0..b53fc9838c5a86e3690bd5d031b5f84dea1f1c37 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-135.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/7",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
index 413b6513b412b57ff359ae5ea9685fdcc1bcd3e5..56b61a52e68c7539b5ea27e2dffd608897f0a1cd 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-136.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/8",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
index 20b66eda06df6eaa272e6663b6a6b3cb3646a1fd..63f57a4b4e27e87db6dadfa25fc7297d04436db1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-137.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/9",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
index 400468aab64f7f2c8bafcbea92b23fd3e9b8337a..9a61120544f95da03d264ecff67e811665007f52 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-138.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/10",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
index eccb122f1429809e6e44c7243cb3433a935a197f..72f5cef05cdbba22e30c952a249812250bb6f0a9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-139.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/11",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
index 4085053ff00ed03b57eccc441bf23e3e9dac018c..ddb00af84ed342189db2b4b663adc04e40293786 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-14.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/14",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
index a489ab4ce0e9a9b006e4ddbc8503e3a6a20b94fc..345af24a034f15964bd885c45e795591e8bb1f32 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-140.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi3/12",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
index aee6cdc5facbeca6f0861075feeadebe1f390ec5..f95195994ed0a24e08c07562dcb670e7cf466022 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-15.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/15",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
index 82c941acc3ef131155294ff7a84e6c458d6d3d28..600246221e00653bb7cf1d2759ba33f59f3a6638 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-16.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/16",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
index a3fd111b37446685812eeb5e502e4a022737abd6..1bbe4709561bf711cc5f86e2b59a49009965b0f1 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-17.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/17",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
index 29a4a56c77cb59e5d5b587f1b6973b798fd60757..ea397b5ad06d0308c29a7c68281907f122104498 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-18.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/18",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
index 5df4f017a89608a2a960b751d20a4b748fdbfba3..214d8b64f210f591b5a6d358d22d77df3ba2b2b9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-19.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/19",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
index 075d51bdce6642e614044850f434e51e7d2c6110..89940d5ebfce4b5311636b013412c4a0f689989d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-2.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/2",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
index 78c2f1a490ca3cb8dcb7b086695cb6f477b62a2c..5599050269c0feaed586f817b675f9780687d2dd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-20.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/20",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
index d6aa14265028d9ed2ae96d727eaf067ae2e4c4f9..e77123479402603ef183aed5b6951e13879a3643 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-21.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/21",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
index 2337e0f6cc232d294bec16ed7def6c7c0571fa54..b2b7f5b3b90331cd45ad10092604ae0dbb98826a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-22.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/22",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
index 04de3acfb859a80ebe20e31f9a485f1a75c77470..7811525a524753aabe420667107d62eec4bab6b3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-23.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/23",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
index d6fc308b08b877abd6fb5631f3c8a2ef4825d1e3..04fea25521ad459b74191e26bb6d5220bb88e885 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-24.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/24",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
index 168d14803ecae9234fb74255c0a27839221ac55e..3c26793478f32df4001eaf6a9b6085e1287c0dbe 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-25.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/25",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
index ac643c25232ae647dbf3ac1a21cb1afa02f8615e..55804a6f05dde360cecda612324735ec3e4f0260 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-26.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/26",
       "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 b7cb8b17ffcdf055560eb06bd104d938634a49e1..3875b3c88a8606c4718040b9a32a42bb2106bdc8 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-27.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
index abb249e6cfb3f7b0cdc183568667b24aeb7c24bb..8780e7277d8c71c66474f177408456e1b9361fea 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-28.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/28",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
index 65eeb4306a494661b8d5d2e95ac835cbf0ee6726..f224b7fccadc7102d247decb26b949064adcf60a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-29.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/29",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
index 80f9a7fd1a308aa38904c6b8dff9024020e5733c..d481f11f8e4c906e73a9d2452f198005236410ce 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-3.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/3",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
index 6ae1399813392b21b02b6a6001263d40594bf1d4..c2e45e8f3765df246e4a5e6e70fe129706e09a2a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-30.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/30",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
index 6dc931a630e172132089ce2ca99e3e0894bb38f9..a32c8fc7697c66931cd7de03d867cfca8dc003dc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-31.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/31",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
index 13f7c1fc121af050ee715bf84a34d29a20b6ee66..b5070980043503785ee5420a953e4ef555bac2de 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-32.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/32",
       "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 a986f093d3872d337d065e14b0e3297e10687309..455ed21d97617c6d8ff9966e3724faf125ba849e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-33.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
index 94c8bd4cf8dba54d340d08ebf18ddd0fb6ac9409..ee257801c9ca051580f17b8d82ab44cca4a13617 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-34.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/34",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
index ffcfad25760caaeb1eefaa88e27a0373a4ae6491..994c0a2cfa5375a907ad428a9ce151cc55f9a39d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-35.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/37",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
index 17ac27be7ac577255384731514d1d3743315ed1f..9f5972cf79bb0cd654c7fc2c6cd366e397dec3b4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-36.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/35",
       "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 9ae24e7ab1093e715407c821f1797ab50e6881eb..50345b9c6add0cc5f00241aa0a7bc11b2a14cf9c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-37.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
index b9ee7050241e361fea3c69715d7b08e014bebd19..87f9acfb6f4f68f46296596be0848fb8767ecb1e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-38.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/38",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
index e2d8e20f5f2eae71d63f7e84608b0eb03a0c2f95..591e529b3b21765cb41e4774734690e582e626e2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-39.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/39",
       "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 dc1c15b81d7e2983c208c9859ae3eb099cc314bb..efdc69b8330400e1ce088328306d945a6ae410b3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-4.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
index 70e19ed4594a851a34347f269e97be5957ea7d9f..566669adbd40fa62344b7cab6f6e205c13376a62 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-40.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/40",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
index e7e25644c53ac3975ef6b2f03ce7e31c4f0f0e40..14de29e688d214ff647bc6bef50566b8cfd49b4d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-41.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/1",
       "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 5dbbaf00f6ee80da18dba98a5b8e9614e82d0987..331a9b57942c4a63a7a2d8e5e1532cb20ee22df8 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-42.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 a61247cad7ed2f266720ec3f4338d27ad56e6874..95dc039d3d298bdddc098671cf1e8ee453cec03a 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-43.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
index fac6986fef12f7f6252e5956dbb1492718549a16..4fdf48f5277991d7ab315d16caf1e6d309139748 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-44.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/4",
       "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 aa4b4a19839053b04ef123b2cddbe64ddc7180d7..6eb9b3fc9e65af7135933419d71e76ca5ea8aff6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-45.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
index c332a55802701535bca5cb4eef261b2c5ea14713..78505dba58f14fdce48cd81934466e3c71bbdf4b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-46.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/6",
       "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 b955d4f06343fe19648df4ffae2cdee0a614f815..d9cfe93db0487e462170e4d954ea31fcac12e18b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-47.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 ed560cf315d386237ad27a9b3759ad44644e6fa6..7e866a9eaa3704bb84b955e01830940e064209ff 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-48.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
index 85f09b002b6393c3cc9255dba9bbca6a77833034..2aa9c57d432516c518f691aa0411287107b49246 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-49.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/9",
       "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 4fe964aa6c4bf003f06cbd086ac4d08facb78b18..0be88b8257107f243a71d6028f890e5db58691d0 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-5.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
index b44b312a296dd62440f570420d11fec26575ee38..82549f3eb276d18609d4c5113ab74c2c4502b33f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-50.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/10",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
index 5137344f6eda1e9536d1fcfaa4777a5b6aedc811..1589d2484d1cce7a60f8f03d8dd12c8e76e42157 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-51.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/11",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
index e6b5691d86e50d76f36568a4add15cf19bedd037..525d11a24eb40ec4943d9345d97fc9b0bc9663b6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-52.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/12",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
index bedc6f9e2e976bae2a1a529bff9ceb153632ec4d..c9ae7ba1372aabd997a1161a06516e5da8b86294 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-53.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/13",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
index 65d70eff2db6c1ceddb120b51c3dcbda50b04d28..53b4f492f7c7f98bc6336b26a6342802ff35a3e7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-54.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/14",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
index ace055193ec15fdaf3db368b0d80ce60b7122ce0..7ac94bf32349b3d88face7988285cc582eb09d6e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-55.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/15",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
index 9194a91e463d882a2ddeaf5d8294ab7d5ef3b7a2..704b6b85334a512e7a5b181e09679e0f37e77518 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-56.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/16",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
index 17fdc11f06788248e7fbee9c353f4ce46765bb1b..f7fef300437e859095f523f8c41a44a1aa14001d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-57.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/17",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
index 3d3373ff5a554691edc295c16d9ced8f7047b12e..473aca4da3680af0be4514323ba139760ea80409 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-58.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/18",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
index 5263ad636f8af29aa501a68380dbe97a97cc9bab..41606e4650f1f8c34b8c7f7980b4e04906753033 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-59.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/19",
       "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 3500b316e7bc1556ae6313ecfd763055388e4ae9..25ee90c2bbfee02d52c8a6eda14b83dd33b2bc69 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-6.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 c04d61cd99dc98b00b32644e5605fd59cd80e240..54d1675af683d684f2a16742f7ed67686eff95d6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-60.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 99a50c29d6b83dd8e4039a45591f624cbc533d6b..9801c92f704a989abb0d98997b673c63da3d1bc1 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-61.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
index c6cf946d30737fcf9094adc3697c43ac897a451c..03ac557431d7f79a4acb4ae3954e134b696aea25 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-62.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/22",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
index e6a9076a749c24c16ba9f77f34448a054ec090f9..91068e8f5551e8f6e56be7c2ff5ca044520a61fd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-63.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/23",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
index b762ef9522d28454242ef02dff786474073c2f4c..ac332cf3b5e6608b766daf855ca579cc9932715c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-64.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/24",
       "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 a9b4acaac4bd03dec1ab8da2a9fcbb5afca31744..7982db54613c1819acc90399d6b3b19e3f05a810 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-65.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
index 23d2ee8b32f40172cf582565e5378caf8b7640ba..c1ad6c55a70a1cad5807faa0b3b1f1b80e230a2c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-66.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/26",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
index 1fd1526e11e320e7698e8842915179777e6b48c6..e9b7cfe426850b7da88064d94160ec83a7591d23 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-67.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/27",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
index 0f93b29eddd00ea52d361d4ac65a8be6f6365c72..b044e0b2af087086659aaac69fc81a37ddef842e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-68.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/28",
       "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 2ea896dbcaffacc99c46c4e405206d013f2c9a3d..f0dd97cb59df30c6f7003501a6813318e22d9882 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-69.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 b7ce7f75805228596b037cfd678c13741c88d155..d07b69868531b0a5897831d1d58ecf69c0af8a85 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-7.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 88880e0cc8c54c3e8136f69a38050c31d8b4a6ff..fa9a23f540d8367eea58dabe67766fef31692c93 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-70.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
index 398099229b5f007c0df58c54d81360c9f371e88e..378f223ff8e67a056891148d2f0a854084968168 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-71.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/31",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
index debc1fccfa731739d6cfc00e6d7dda5e45f5e431..1599241ebe0174924495ff0e2b3bf8308a9c6316 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-72.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/32",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
index 88a25b87750a638f465414ad4667bffa03dd6e7c..aca4504735df1d106759a4e44ca66f3cfbc68749 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-73.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/33",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
index aabf7f71880ce2254c20d1220509c7c94ee608e5..ccf455829096adad5f7d371afb49c69c2f29b0c9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-74.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/34",
       "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 d7783076cf9445c1a07cb6dd0a62887ebc15bc9c..e0475f10364facf986b831230239bd43392b07c3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-75.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
index a798f4c4a63dd6aba81c635fc27624339b29d8a0..2cc40df79f804239eafa4fa019721951ff7a24a1 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-76.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/36",
       "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 bdb78bd673488a15e02bdac4a3af20db51cc23dc..e17d0dbfd2ad3a7d94c18d0644136daa088cfba5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-77.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "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 39ace993aec91fa29a08cdb33165497720d2480f..0dd9f8218a4532b50497145133f031d309ec7c70 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-78.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
index 4b58163e802f48a0954aefa1cdd943ab982689bc..80c510753525034d37ca5ceb36cceb556bca0d1c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-79.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/39",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
index 7fb9408273d231bce6438d08c659f4822a5838f8..c4cd4d1b7430ced5f135ea4f9f1fe412f95beb28 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-8.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/8",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
index 5fccff30477b9470243321f67b075c804d223a89..8c27ce9e76863ab6f8c7dba978d1b35f689476d7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-80.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi4/40",
       "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 46dcf8c91f30ad9531e2ccf45330202176465516..ed3605338bd26ca7b8c29e1155db335ec950cdd3 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-81.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
index eda4e5a1120f84b4e7d710a1c544e8a345d1de1f..b8fcb6a72a112955fe8e1bf9256696929395fdd8 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-82.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/2",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
index 7f54a4d52fef4e7f41e3b3590123c68158c0f584..395898a7886319801b91ee08be043418a1f86a08 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-83.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/3",
       "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 da40975774327af4e79f8e3f0af6035cc1fe0b35..99b47a502b01ec23974db4987450260076929b22 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-84.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
index 23ee5b592f51f50fc15d41b16353435b62bacc94..3997fd748218c0d95ed4e2a06ae69d998e565189 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-85.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/5",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
index eeecf1c005e335a5496872bd153bdacc152aa332..87c068c7947b225724b9dd33d8223c2049d0cbda 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-86.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/6",
       "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 a9ae0b2b97f0f8e7d9bded7943bbf4b670852000..080babf974faf3c0aa87322a064c4b0f9551a0d1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-87.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": null,
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
index 226468085c5f839f1e37c954b422f1f621646387..0e372b68e956a40f286e3e2e4d63a2b6c9cac04d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-88.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/8",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
index 256bc4be0f66f15ff088a73b5efcf1b3e553edcf..54a939fa888c8dbff6fe2fc23fab2d0b9d3258ea 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-89.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/9",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
index 7c7414bb96b7d12abcd9da1449ce34a7e9b9414d..6dbed14b28dd2e6d1cdabf4306e9bc2ea6705572 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-9.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "r4",
+      "switch_port": "Gi1/9",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
index 87ab414e59c49d0cb6cc189df70d304e521a82c7..a22efd7bfa299eb4a3c0fc9d9ed6ecd196bd436a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-90.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/10",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
index 2ac7a4871b2ecd4f4e284788d5b08970574a65f7..8d5ceb59499bab77732987774724312499e8157e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-91.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/11",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
index 27fe207e455e94b55eda1a6c2d2802c07f60ee4d..7b263769ced8ad5ad753bd922f6fdd0209aa5f62 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-92.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/12",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
index 48825106e9d98d9e6eb570fb40481f9e18062cea..29d25cddc26f6e851d7c30a5d9278260f982d36d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-93.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/13",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
index 1ff5ce13c381d5268aba7e51c9d799245f08a27a..6276b481edcdb6383bc1c4fc70726ada519128b9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-94.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/14",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
index 0dd6aff9502a694e46670be1ae908ddcac395bb9..8240a475899038ed526ddcb79f8f340f53a9f7c2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-95.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/15",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
index 399456943a9ddc2adf6e12007d950d21793fe6b2..0d6d97ba9b347fe83bbc45678af7ec911647a181 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-96.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/16",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
index 57aec2569fdb25ea1d2917bc7c3a1814c3b45774..dec7a612878be68fae63a3bb4e46579fe876e33b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-97.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/17",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
index 25f94a5e9bb104e6386556fb0d591590953297d1..92109a068e544cbec303388e4e2d852b81645e94 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-98.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/18",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
index a16e00d375cf510dfa5ad01c27d7a37381842b38..af8c78ed7f7948f5aa55a35f307a582deeef6360 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
@@ -24,6 +24,7 @@
       "network_address": "pastel-99.toulouse.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
+      "switch_port": "Gi2/19",
       "vendor": "NVIDIA",
       "version": "MCP55 Pro"
     },