[grenoble] #4867 correct edel-[37,38], correct gw to gw-grenoble for adonis et genepi cluster

c1714025 · Elodie Bertoncello · d67dc89c · c1714025 · c1714025 · c1714025
Commit c1714025 authored Feb 22, 2013 by Elodie Bertoncello
49 changed files
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-1.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/11",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-10.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/20",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-2.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/12",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-3.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/13",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-4.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/14",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-5.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/15",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-6.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/16",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-7.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/17",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-8.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/18",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -54,7 +54,7 @@
      "mounted": true,
      "network_address": "adonis-9.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/19",
      "vendor": "Intel",
      "version": "Device 10c9 (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -65,7 +65,7 @@
      "mounted": true,
      "network_address": "edel-37.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "blade-",
+      "switch": "edel-sw-3",
      "switch_port": null,
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -65,7 +65,7 @@
      "mounted": true,
      "network_address": "edel-38.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "blade-",
+      "switch": "edel-sw-3",
      "switch_port": null,
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-1.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/22",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-10.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/37",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-11.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/9",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-12.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/38",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-13.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/17",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-14.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/29",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-15.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/7",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-16.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/25",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-17.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/6",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-18.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/27",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-19.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/16",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-2.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/42",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-20.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/31",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-21.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/10",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-22.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/32",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-23.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/14",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-24.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/30",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-25.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/15",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-26.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/8",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-27.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/4",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-28.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/33",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-29.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/3",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-3.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/21",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-30.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/28",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-31.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/13",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-32.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/34",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-33.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/5",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-34.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/26",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-4.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/40",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-5.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/19",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-6.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-7.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/20",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-8.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi3/39",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -75,7 +75,7 @@
      "mounted": true,
      "network_address": "genepi-9.grenoble.grid5000.fr",
      "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-grenoble",
      "switch_port": "Gi4/18",
      "vendor": "Intel",
      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"

--- a/generators/input/sites/grenoble/clusters/adonis.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis.yaml
@@ -22,7 +22,7 @@ adonis-1:
    eth0:
      mac: 00:30:48:cc:7f:d8
      ip: 172.16.16.131
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/11
    eth1:
      mac: 00:30:48:cc:7f:d9
@@ -53,7 +53,7 @@ adonis-2:
    eth0:
      mac: 00:30:48:cc:7f:da
      ip: 172.16.16.132
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/12
    eth1:
      mac: 00:30:48:cc:7f:db
@@ -84,7 +84,7 @@ adonis-3:
    eth0:
      mac: 00:30:48:cd:c6:a4
      ip: 172.16.16.133
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/13
    eth1:
      mac: 00:30:48:cd:c6:a5
@@ -115,7 +115,7 @@ adonis-4:
    eth0:
      mac: 00:30:48:cd:c0:ac
      ip: 172.16.16.134
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/14
    eth1:
      mac: 00:30:48:cd:c0:ad
@@ -146,7 +146,7 @@ adonis-5:
    eth0:
      mac: 00:30:48:cc:7e:0a
      ip: 172.16.16.135
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/15
    eth1:
      mac: 00:30:48:cc:7e:0b
@@ -177,7 +177,7 @@ adonis-6:
    eth0:
      mac: 00:30:48:cc:7a:bc
      ip: 172.16.16.136
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/16
    eth1:
      mac: 00:30:48:cc:7a:bd
@@ -208,7 +208,7 @@ adonis-7:
    eth0:
      mac: 00:30:48:cd:c6:80
      ip: 172.16.16.137
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/17
    eth1:
      mac: 00:30:48:cd:c6:81
@@ -239,7 +239,7 @@ adonis-8:
    eth0:
      mac: 00:30:48:cd:c0:ae
      ip: 172.16.16.138
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/18
    eth1:
      mac: 00:30:48:cd:c0:af
@@ -270,7 +270,7 @@ adonis-9:
    eth0:
      mac: 00:25:90:4c:e9:84
      ip: 172.16.16.139
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/19
    eth1:
      mac: 00:30:48:cb:cf:7f
@@ -301,7 +301,7 @@ adonis-10:
    eth0:
      mac: 00:30:48:cc:83:10
      ip: 172.16.16.140
-      switch_name: gw
+      switch_name: gw-grenoble
      switch_port: Gi3/20
    eth1:
      mac: 00:30:48:cc:83:11

--- a/generators/input/sites/grenoble/clusters/edel.yaml
+++ b/generators/input/sites/grenoble/clusters/edel.yaml
@@ -1137,7 +1137,7 @@ edel-37:
    eth0:
      mac: 08:00:38:36:f3:06
      ip: 172.16.16.87
-      switch_name: blade-
+      switch_name: edel-sw-3
      switch_port: 
    eth1:
      mac: 08:00:38:36:f3:07
@@ -1168,7 +1168,7 @@ edel-38:
    eth0:
      mac: 08:00:38:35:ab:d2
      ip: 172.16.16.88
-      switch_name: blade-
+      switch_name: edel-sw-3
      switch_port: 
    eth1:
      mac: 08:00:38:35:ab:d3

--- a/generators/input/sites/grenoble/clusters/genepi.yaml
+++ b/generators/input/sites/grenoble/clusters/genepi.yaml
@@ -24,7 +24,7 @@ genepi-1:
    eth1: