From 345baa340b4b35831de84ee841712ea98f226efb Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Tue, 7 Aug 2012 17:05:15 +0200
Subject: [PATCH] [Grenoble] bug #4362 add edel switches - correct switch for
 genepi cluster

---
 .../grenoble/clusters/edel/nodes/edel-1.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-10.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-11.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-12.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-13.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-14.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-15.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-16.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-17.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-18.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-19.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-2.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-20.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-21.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-22.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-23.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-24.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-25.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-26.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-27.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-28.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-29.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-3.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-30.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-31.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-32.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-33.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-34.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-35.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-36.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-37.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-38.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-39.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-4.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-40.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-41.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-42.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-43.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-44.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-45.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-46.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-47.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-48.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-49.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-5.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-50.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-51.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-52.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-53.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-54.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-55.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-56.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-57.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-58.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-59.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-6.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-60.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-61.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-62.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-63.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-64.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-65.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-66.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-67.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-68.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-69.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-7.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-70.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-71.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-72.json |   2 +
 .../grenoble/clusters/edel/nodes/edel-8.json  |   2 +
 .../grenoble/clusters/edel/nodes/edel-9.json  |   2 +
 .../clusters/genepi/nodes/genepi-1.json       |   2 +-
 .../clusters/genepi/nodes/genepi-10.json      |   2 +-
 .../clusters/genepi/nodes/genepi-11.json      |   2 +-
 .../clusters/genepi/nodes/genepi-12.json      |   2 +-
 .../clusters/genepi/nodes/genepi-13.json      |   2 +-
 .../clusters/genepi/nodes/genepi-14.json      |   2 +-
 .../clusters/genepi/nodes/genepi-15.json      |   2 +-
 .../clusters/genepi/nodes/genepi-16.json      |   2 +-
 .../clusters/genepi/nodes/genepi-17.json      |   2 +-
 .../clusters/genepi/nodes/genepi-18.json      |   2 +-
 .../clusters/genepi/nodes/genepi-19.json      |   2 +-
 .../clusters/genepi/nodes/genepi-2.json       |   2 +-
 .../clusters/genepi/nodes/genepi-20.json      |   2 +-
 .../clusters/genepi/nodes/genepi-21.json      |   2 +-
 .../clusters/genepi/nodes/genepi-22.json      |   2 +-
 .../clusters/genepi/nodes/genepi-23.json      |   2 +-
 .../clusters/genepi/nodes/genepi-24.json      |   2 +-
 .../clusters/genepi/nodes/genepi-25.json      |   2 +-
 .../clusters/genepi/nodes/genepi-26.json      |   2 +-
 .../clusters/genepi/nodes/genepi-27.json      |   2 +-
 .../clusters/genepi/nodes/genepi-28.json      |   2 +-
 .../clusters/genepi/nodes/genepi-29.json      |   2 +-
 .../clusters/genepi/nodes/genepi-3.json       |   2 +-
 .../clusters/genepi/nodes/genepi-30.json      |   2 +-
 .../clusters/genepi/nodes/genepi-31.json      |   2 +-
 .../clusters/genepi/nodes/genepi-32.json      |   2 +-
 .../clusters/genepi/nodes/genepi-33.json      |   2 +-
 .../clusters/genepi/nodes/genepi-34.json      |   2 +-
 .../clusters/genepi/nodes/genepi-4.json       |   2 +-
 .../clusters/genepi/nodes/genepi-5.json       |   2 +-
 .../clusters/genepi/nodes/genepi-6.json       |   2 +-
 .../clusters/genepi/nodes/genepi-7.json       |   2 +-
 .../clusters/genepi/nodes/genepi-8.json       |   2 +-
 .../clusters/genepi/nodes/genepi-9.json       |   2 +-
 .../input/sites/grenoble/clusters/edel.rb     |   4 +-
 .../input/sites/grenoble/clusters/edel.yaml   | 144 ++++++++++++++++++
 .../input/sites/grenoble/clusters/genepi.rb   |   2 +-
 109 files changed, 326 insertions(+), 36 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index b34e18019da..6f172ff5c15 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-1-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 2e7137543b5..f715c50fac2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-10-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index b0457d6ff8d..0ad564bd446 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-11-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 001e98561fe..a88531d09c2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-12-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 3e1712f9e61..e5e588ff01c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-13-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index f2d0e67fd3d..b1ffd40b466 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-14-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 1f8017fcf3d..bd4f013dab0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-15-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index f3830f11819..ec1db8892b6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-16-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index 105dade3155..6e624e04ba8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-17-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 417092ebf68..58d43cad4c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-18-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 3a865fd9df5..031892e1f44 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-19-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index d75e59026ff..b69f9c1bd7c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-2-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 4a7f1386b9f..8e8b1e540aa 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-20-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index c9b7d716b4e..955247f9a0c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-21-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 9d1852cfce7..d335d3d39a5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-22-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index 47ae40c1bb2..9e274206829 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-23-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 14e1031fc81..9f7c292d3dd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-24-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index 1832b818286..7f4b251ca1d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-25-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 346522b0036..925aecc674b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-26-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index e722e0bb2de..6fbe9e7b47b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-27-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index e0b80ce2f9a..a3533a822fe 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-28-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index 81fa01d9d91..094c64b5a34 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-29-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index 69f6ac43be4..ec109295375 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-3-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 0f12df742b8..2ede8f54093 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-30-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index c8466d1914b..1ac2cfacf49 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-31-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index ea4743999ec..94ea50c783f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-32-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 9667e28d401..8360fb73635 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-33-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index 1cad2d87095..45ddf7110c1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-34-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 705262a5cdd..f8caf584d43 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-35-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 6703382d86f..e2e44fce770 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-36-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-2",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index a3c4f591452..7485c25f534 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-37-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "blade-",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index d568ec0febb..f03c24ac212 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-38-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "blade-",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 8eb882e9474..f54882edf21 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-39-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 9d3afec6eb7..6bc1599c1e4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-4-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 35114924d6b..7e84b113bc0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-40-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index e22dd1d1647..e7aa1a2cd89 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-41-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 7bda16cce99..40626606510 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-42-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 2e92b71ff68..54b96d09766 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-43-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index a605f4501d6..ba8572ec469 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-44-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index 19a36eb86c0..091ea271e1a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-45-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index d3ed4e7b9bc..3782086e9bd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-46-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 1eedb0cea21..df41c39da6a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-47-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 5a5b3e9f017..b5ea77e14bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-48-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index bbe5d24263a..9eb8623c6be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-49-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index f7d4aea0736..e9b17a3e4fb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-5-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index e9b72586bcf..401388d0996 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-50-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 24b90945f1a..8443c4697eb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-51-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 26c1da3a18a..f74c0bb6813 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-52-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index 4c0afeda126..db5ca7f417e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-53-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index e778c17f8fe..3d24b6601e3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-54-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-3",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index c7f39d5443a..6a72a9a26a6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-55-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 394d1b12073..277342732d3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-56-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 602502a4539..6dec520aac7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-57-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index 32889853894..4c8b4aba383 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-58-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index feb444ba2d9..de16c0e3314 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-59-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 20a2293e8e2..17db102d880 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-6-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index bf0922dc939..8c0b24a9726 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-60-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 997ad651a86..461e2929da6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-61-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 5a27a2c1c22..43ddb6e9eed 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-62-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 10909291347..97a94018dec 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-63-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index e1677542cd0..626a0958013 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-64-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 7e743e469a4..640c50375ba 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-65-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index e2fde0d672c..534f00ffc63 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-66-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index 59279d07b72..3d23c8e13d9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-67-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 90a8544e2db..c3a1e8cc358 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-68-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 781fb5fa00e..8839876a0a5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-69-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index a5b8eb4f044..c0ff680bcc3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-7-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index 4898551cb7f..002a8787af4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-70-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 40c27f19610..4590f9f040e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-71-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 4276cc86bed..38ff7e5b7ec 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-72-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-4",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 194be3165df..0e1abbb9d6f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-8-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index b2c47ca29b1..643cf2ac90f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -59,6 +59,8 @@
       "mounted": true,
       "network_address": "edel-9-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
+      "switch": "edel-sw-1",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82576 Gigabit Network Connection"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 127ada78a50..f9f656af2a5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-1.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/22",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 57cd392dd6f..a1262de917f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-10.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/37",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index 5597bdfe7b0..b0f709f2d6c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-11.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/9",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 8615ba385ec..d18fe071b85 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-12.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/38",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 39955867e9b..f775b1e2c90 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-13.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/17",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 936c1b088a6..10574267118 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-14.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/29",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 70a7c250a09..90c408969d0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-15.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/7",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index 9ee162e2465..b03dcd08976 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-16.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/25",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 498e8c741b4..fcd641082cd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-17.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/6",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index b79b10e470c..285585c8539 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-18.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/27",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index a114b18c09f..9652f2afd7c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-19.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/16",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index caa0245061e..ec21a3d7be7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-2.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/42",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 587b7404f48..0235e390860 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-20.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/31",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index c4fe7e221e2..cc45cc4319b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-21.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/10",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 431c77bc21a..4bdb91d5a11 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-22.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/32",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index f31ddf0822d..84bc44d8916 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-23.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/14",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 59b826b88f6..da6e87adfca 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-24.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/30",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 52a56d6b3b4..e0b6e5a2568 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-25.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/15",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 920e7434eca..373afb6f40e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-26.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/8",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index 75a8493da80..4cf5d743182 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-27.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/4",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index 13b6585a462..8e0cdd58c97 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-28.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/33",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 132efe8eae7..03179e5ea5a 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-29.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/3",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index 40f55725df9..68a9085973b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-3.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/21",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index 0d615034b7c..59f677a99fe 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-30.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/28",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 0bcf025be9b..9761e60f62d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-31.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/13",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index 89f0a38a578..c5a66da565c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-32.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/34",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 2005d63925d..fed119c6425 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-33.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/5",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index d854ef490c0..19a7010eae0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-34.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/26",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 339501ce991..86a006ca803 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-4.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/40",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 23f57aaaed6..4531c411989 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-5.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/19",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index 5b1734d79e6..6b33af73b65 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-6.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index 7004bee6d64..b1fcc2aaedb 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-7.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/20",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 4f54de87747..dfb754de574 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-8.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi3/39",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index fc9616293b3..41a11e08e6c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -69,7 +69,7 @@
       "mounted": true,
       "network_address": "genepi-9.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch_name": "gw",
+      "switch": "gw",
       "switch_port": "Gi4/18",
       "vendor": "Intel",
       "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
diff --git a/generators/input/sites/grenoble/clusters/edel.rb b/generators/input/sites/grenoble/clusters/edel.rb
index d8206438b0a..63b835a049f 100644
--- a/generators/input/sites/grenoble/clusters/edel.rb
+++ b/generators/input/sites/grenoble/clusters/edel.rb
@@ -82,7 +82,9 @@ site :grenoble do |site_uid|
           :mac => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'mac'),
           :vendor => "Intel",
           :version => "82576 Gigabit Network Connection",
-          :driver => "igb"
+          :driver => "igb",
+          :switch => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port => lookup('edel', node_uid, 'network_interfaces', 'eth0', 'switch_port')
         },
         {
           :interface => 'Ethernet',
diff --git a/generators/input/sites/grenoble/clusters/edel.yaml b/generators/input/sites/grenoble/clusters/edel.yaml
index a8167b3d92e..49d74b81aa5 100644
--- a/generators/input/sites/grenoble/clusters/edel.yaml
+++ b/generators/input/sites/grenoble/clusters/edel.yaml
@@ -21,6 +21,8 @@ edel-1:
     eth0:
       mac: 08:00:38:36:f3:be
       ip: 172.16.16.51
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:36:f3:bf
       ip: 
@@ -50,6 +52,8 @@ edel-2:
     eth0:
       mac: 08:00:38:36:f5:a8
       ip: 172.16.16.52
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:07
       ip: 
@@ -79,6 +83,8 @@ edel-3:
     eth0:
       mac: 08:00:38:35:ab:8c
       ip: 172.16.16.53
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:8d
       ip: 
@@ -108,6 +114,8 @@ edel-4:
     eth0:
       mac: 08:00:38:36:d2:4c 
       ip: 172.16.16.54
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:36:d2:4d
       ip: 
@@ -137,6 +145,8 @@ edel-5:
     eth0:
       mac: 08:00:38:36:f3:3a
       ip: 172.16.16.55
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:36:f3:3b
       ip: 
@@ -166,6 +176,8 @@ edel-6:
     eth0:
       mac: 08:00:38:35:ac:54
       ip: 172.16.16.56
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:55
       ip: 
@@ -195,6 +207,8 @@ edel-7:
     eth0:
       mac: 08:00:38:35:ab:40
       ip: 172.16.16.57
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:41
       ip: 
@@ -224,6 +238,8 @@ edel-8:
     eth0:
       mac: 08:00:38:35:ab:56
       ip: 172.16.16.58
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:57
       ip: 
@@ -253,6 +269,8 @@ edel-9:
     eth0:
       mac: 08:00:38:35:ab:d8
       ip: 172.16.16.59
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:d9
       ip: 
@@ -282,6 +300,8 @@ edel-10:
     eth0:
       mac: 08:00:38:35:ab:94
       ip: 172.16.16.60
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:95
       ip: 
@@ -311,6 +331,8 @@ edel-11:
     eth0:
       mac: 08:00:38:35:ab:90
       ip: 172.16.16.61
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:91
       ip: 
@@ -340,6 +362,8 @@ edel-12:
     eth0:
       mac: 08:00:38:35:ac:3c
       ip: 172.16.16.62
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:3d
       ip: 
@@ -369,6 +393,8 @@ edel-13:
     eth0:
       mac: 08:00:38:35:ab:dc
       ip: 172.16.16.63
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:dd
       ip: 
@@ -398,6 +424,8 @@ edel-14:
     eth0:
       mac: 08:00:38:35:ab:ac
       ip: 172.16.16.64
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:ad
       ip: 
@@ -427,6 +455,8 @@ edel-15:
     eth0:
       mac: 08:00:38:35:ab:fc
       ip: 172.16.16.65
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:fd
       ip: 
@@ -456,6 +486,8 @@ edel-16:
     eth0:
       mac: 08:00:38:35:ac:0c
       ip: 172.16.16.66
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:0d
       ip: 
@@ -485,6 +517,8 @@ edel-17:
     eth0:
       mac: 08:00:38:35:ab:9e
       ip: 172.16.16.67
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:9f
       ip: 
@@ -514,6 +548,8 @@ edel-18:
     eth0:
       mac: 08:00:38:35:ab:82
       ip: 172.16.16.68
+      switch_name: edel-sw-1
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:83
       ip: 
@@ -543,6 +579,8 @@ edel-19:
     eth0:
       mac: 08:00:38:35:ab:d0
       ip: 172.16.16.69
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:d1
       ip: 
@@ -572,6 +610,8 @@ edel-20:
     eth0:
       mac: 08:00:38:35:ab:78
       ip: 172.16.16.70
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:79
       ip: 
@@ -601,6 +641,8 @@ edel-21:
     eth0:
       mac: 08:00:38:35:ac:4a
       ip: 172.16.16.71
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:4b
       ip: 
@@ -630,6 +672,8 @@ edel-22:
     eth0:
       mac: 08:00:38:35:ab:9c
       ip: 172.16.16.72
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:9d
       ip: 
@@ -659,6 +703,8 @@ edel-23:
     eth0:
       mac: 08:00:38:35:ab:d6
       ip: 172.16.16.73
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:d7
       ip: 
@@ -688,6 +734,8 @@ edel-24:
     eth0:
       mac: 08:00:38:35:ac:26
       ip: 172.16.16.74
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:27
       ip: 
@@ -717,6 +765,8 @@ edel-25:
     eth0:
       mac: 08:00:38:35:aa:b8
       ip: 172.16.16.75
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:aa:b9
       ip: 
@@ -746,6 +796,8 @@ edel-26:
     eth0:
       mac: 08:00:38:35:ab:54
       ip: 172.16.16.76
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:55
       ip: 
@@ -775,6 +827,8 @@ edel-27:
     eth0:
       mac: 08:00:38:35:ac:3e
       ip: 172.16.16.77
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:3f
       ip: 
@@ -804,6 +858,8 @@ edel-28:
     eth0:
       mac: 08:00:38:35:ac:48
       ip: 172.16.16.78
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:49
       ip: 
@@ -833,6 +889,8 @@ edel-29:
     eth0:
       mac: 08:00:38:35:ab:be
       ip: 172.16.16.79
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:bf
       ip: 
@@ -862,6 +920,8 @@ edel-30:
     eth0:
       mac: 08:00:38:35:ab:ba
       ip: 172.16.16.80
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:bb
       ip: 
@@ -891,6 +951,8 @@ edel-31:
     eth0:
       mac: 08:00:38:35:af:3e
       ip: 172.16.16.81
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:af:3f
       ip: 
@@ -920,6 +982,8 @@ edel-32:
     eth0:
       mac: 08:00:38:35:ab:46
       ip: 172.16.16.82
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:47
       ip: 
@@ -949,6 +1013,8 @@ edel-33:
     eth0:
       mac: 08:00:38:35:ac:4c
       ip: 172.16.16.83
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:4d
       ip: 
@@ -978,6 +1044,8 @@ edel-34:
     eth0:
       mac: 08:00:38:35:ab:a2
       ip: 172.16.16.84
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:a3
       ip: 
@@ -1007,6 +1075,8 @@ edel-35:
     eth0:
       mac: 08:00:38:35:ab:62
       ip: 172.16.16.85
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:63
       ip: 
@@ -1036,6 +1106,8 @@ edel-36:
     eth0:
       mac: 08:00:38:35:ab:e6
       ip: 172.16.16.86
+      switch_name: edel-sw-2
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:e7
       ip: 
@@ -1065,6 +1137,8 @@ edel-37:
     eth0:
       mac: 08:00:38:36:f3:06
       ip: 172.16.16.87
+      switch_name: blade-
+      switch_port: 
     eth1:
       mac: 08:00:38:36:f3:07
       ip: 
@@ -1094,6 +1168,8 @@ edel-38:
     eth0:
       mac: 08:00:38:35:ab:d2
       ip: 172.16.16.88
+      switch_name: blade-
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:d3
       ip: 
@@ -1123,6 +1199,8 @@ edel-39:
     eth0:
       mac: 08:00:38:35:ac:2a
       ip: 172.16.16.89
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:2b
       ip: 
@@ -1152,6 +1230,8 @@ edel-40:
     eth0:
       mac: 08:00:38:35:ab:a8
       ip: 172.16.16.90
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:a9
       ip: 
@@ -1181,6 +1261,8 @@ edel-41:
     eth0:
       mac: 08:00:38:36:f5:a4
       ip: 172.16.16.91
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:36:f5:a5
       ip: 
@@ -1210,6 +1292,8 @@ edel-42:
     eth0:
       mac: 08:00:38:36:cf:d8
       ip: 172.16.16.92
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:36:cf:d9
       ip: 
@@ -1239,6 +1323,8 @@ edel-43:
     eth0:
       mac: 08:00:38:35:ab:d4
       ip: 172.16.16.93
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:d5
       ip: 
@@ -1268,6 +1354,8 @@ edel-44:
     eth0:
       mac: 08:00:38:35:ab:aa
       ip: 172.16.16.94
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:ab
       ip: 
@@ -1297,6 +1385,8 @@ edel-45:
     eth0:
       mac: 08:00:38:35:ac:22
       ip: 172.16.16.95
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:23
       ip: 
@@ -1326,6 +1416,8 @@ edel-46:
     eth0:
       mac: 08:00:38:35:ab:4a
       ip: 172.16.16.96
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:4b
       ip: 
@@ -1355,6 +1447,8 @@ edel-47:
     eth0:
       mac: 08:00:38:35:ab:bc
       ip: 172.16.16.97
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:bd
       ip: 
@@ -1384,6 +1478,8 @@ edel-48:
     eth0:
       mac: 08:00:38:35:ab:70
       ip: 172.16.16.98
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:71
       ip: 
@@ -1413,6 +1509,8 @@ edel-49:
     eth0:
       mac: 08:00:38:35:ab:b6
       ip: 172.16.16.99
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:b7
       ip: 
@@ -1442,6 +1540,8 @@ edel-50:
     eth0:
       mac: 08:00:38:35:ac:10
       ip: 172.16.16.100
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:11
       ip: 
@@ -1471,6 +1571,8 @@ edel-51:
     eth0:
       mac: 08:00:38:35:ac:40
       ip: 172.16.16.101
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:41
       ip: 
@@ -1500,6 +1602,8 @@ edel-52:
     eth0:
       mac: 08:00:38:35:ac:1a
       ip: 172.16.16.102
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:1b
       ip: 
@@ -1529,6 +1633,8 @@ edel-53:
     eth0:
       mac: 08:00:38:35:ac:34
       ip: 172.16.16.103
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:35
       ip: 
@@ -1558,6 +1664,8 @@ edel-54:
     eth0:
       mac: 08:00:38:35:ac:3a
       ip: 172.16.16.104
+      switch_name: edel-sw-3
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:3b
       ip: 
@@ -1587,6 +1695,8 @@ edel-55:
     eth0:
       mac: 08:00:38:35:ab:e8
       ip: 172.16.16.105
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:e9
       ip: 
@@ -1616,6 +1726,8 @@ edel-56:
     eth0:
       mac: 08:00:38:35:ac:00
       ip: 172.16.16.106
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:01
       ip: 
@@ -1645,6 +1757,8 @@ edel-57:
     eth0:
       mac: 08:00:38:35:ab:ae
       ip: 172.16.16.107
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:af
       ip: 
@@ -1674,6 +1788,8 @@ edel-58:
     eth0:
       mac: 08:00:38:35:ac:08
       ip: 172.16.16.108
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:09
       ip: 
@@ -1703,6 +1819,8 @@ edel-59:
     eth0:
       mac: 08:00:38:35:ab:5a
       ip: 172.16.16.109
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:5b
       ip: 
@@ -1732,6 +1850,8 @@ edel-60:
     eth0:
       mac: 08:00:38:35:ac:24
       ip: 172.16.16.110
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:25
       ip: 
@@ -1761,6 +1881,8 @@ edel-61:
     eth0:
       mac: 08:00:38:35:ab:5c
       ip: 172.16.16.111
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:5d
       ip: 
@@ -1790,6 +1912,8 @@ edel-62:
     eth0:
       mac: 08:00:38:35:ab:da
       ip: 172.16.16.112
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:db
       ip: 
@@ -1819,6 +1943,8 @@ edel-63:
     eth0:
       mac: 08:00:38:35:ab:b2
       ip: 172.16.16.113
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:b3
       ip: 
@@ -1848,6 +1974,8 @@ edel-64:
     eth0:
       mac: 08:00:38:35:ad:be
       ip: 172.16.16.114
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ad:bf
       ip: 
@@ -1877,6 +2005,8 @@ edel-65:
     eth0:
       mac: 08:00:38:35:ab:e4
       ip: 172.16.16.115
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:e5
       ip: 
@@ -1906,6 +2036,8 @@ edel-66:
     eth0:
       mac: 08:00:38:35:ac:14
       ip: 172.16.16.116
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:15
       ip: 
@@ -1935,6 +2067,8 @@ edel-67:
     eth0:
       mac: 08:00:38:35:ab:fa
       ip: 172.16.16.117
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:fb
       ip: 
@@ -1964,6 +2098,8 @@ edel-68:
     eth0:
       mac: 08:00:38:35:ab:b0
       ip: 172.16.16.118
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:b1
       ip: 
@@ -1993,6 +2129,8 @@ edel-69:
     eth0:
       mac: 08:00:38:35:ac:68
       ip: 172.16.16.119
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:69
       ip: 
@@ -2022,6 +2160,8 @@ edel-70:
     eth0:
       mac: 08:00:38:35:ac:66
       ip: 172.16.16.120
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ac:67
       ip: 
@@ -2051,6 +2191,8 @@ edel-71:
     eth0:
       mac: 08:00:38:35:ab:66
       ip: 172.16.16.121
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:35:ab:67
       ip: 
@@ -2080,6 +2222,8 @@ edel-72:
     eth0:
       mac: 08:00:38:36:f3:dc
       ip: 172.16.16.122
+      switch_name: edel-sw-4
+      switch_port: 
     eth1:
       mac: 08:00:38:36:f3:dd
       ip: 
diff --git a/generators/input/sites/grenoble/clusters/genepi.rb b/generators/input/sites/grenoble/clusters/genepi.rb
index edd96f5a9e3..d0e159bf80a 100644
--- a/generators/input/sites/grenoble/clusters/genepi.rb
+++ b/generators/input/sites/grenoble/clusters/genepi.rb
@@ -94,7 +94,7 @@ site :grenoble do |site_uid|
           :vendor => "Intel",
           :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
           :driver => "e1000e",
-          :switch_name => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
+          :switch => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
           :switch_port => lookup('genepi', node_uid, 'network_interfaces', 'eth1', 'switch_port')
         },
         {
-- 
GitLab