diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json index 5e3ec290ce2202679538205beafb385a15d028cc..477b0d7a4819bea770c7de07a9744a6449d006f2 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json @@ -42,7 +42,7 @@ "network_address": "adonis-1.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/11", + "switch_port": "3:11", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json index 09d2b185435bdaf8551b4097f01b49177a4b00ab..bb0bb199b3e893d0ceab4feda5344717a74137df 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json @@ -42,7 +42,7 @@ "network_address": "adonis-10.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/20", + "switch_port": "3:20", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json index 5a0141e0fd44f777d39e2f25b3ab6b9f54f95499..3ec2cca65cf556e56f7e268ac81d9714c28fa159 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json @@ -42,7 +42,7 @@ "network_address": "adonis-2.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/12", + "switch_port": "3:12", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json index 1a42d7a7817641edada4670e48729d2d934f98b2..73c143ba5b02a63cf9f062d64f2411992a5c806f 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json @@ -42,7 +42,7 @@ "network_address": "adonis-3.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/13", + "switch_port": "3:13", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json index d7cc8478b2c00191c4581fdfdffb13539e28f8a5..6fd8123ad6fb88ab5b9a8b4d8c5cde7bad4ab1ed 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json @@ -42,7 +42,7 @@ "network_address": "adonis-4.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/14", + "switch_port": "3:14", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json index 422b53296f1f6d0bd622ef60426386c2a1a74071..aa443dd56b60ed5467d2abe596408432e3e4ac44 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json @@ -42,7 +42,7 @@ "network_address": "adonis-5.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/15", + "switch_port": "3:15", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json index 897e5acbe58e9b026e2043244423e2162d98698c..237af8b6bfa0a43ac61f0d9b5d55941c9b02fbc4 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json @@ -42,7 +42,7 @@ "network_address": "adonis-6.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/16", + "switch_port": "3:16", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json index 435a29d4c9631c22bda9cb7c56a349ce0f26dd08..874448f1ce06443759cde58766bd592b1566f6e8 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json @@ -42,7 +42,7 @@ "network_address": "adonis-7.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/17", + "switch_port": "3:17", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json index 5218a832aacaa2a6b8300ade90966cd906f7e9d1..bdd539a9c2d71e3aa9b6e24e6bf21c985a83c6eb 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json @@ -42,7 +42,7 @@ "network_address": "adonis-8.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/18", + "switch_port": "3:18", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json index d27ecc242c1d1869b3265058e34eefd57353d3cd..f16f37b07c20bedb8745b3090cd7f51bb43ace66 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json @@ -42,7 +42,7 @@ "network_address": "adonis-9.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/19", + "switch_port": "3:19", "vendor": "Intel", "version": "Device 10c9 (rev 01)" }, 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 d6cc07a42cd96d30ec09fd2edf65a83d395a6a3e..9223a0df4dfe1e5c0c0a866e8b34484abae753d2 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json @@ -54,7 +54,7 @@ "network_address": "genepi-1.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/22", + "switch_port": "4: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 326abc55eb4d6f89aabfb78e24926e1f96ec2fec..9434435a165a4525ea9a8d4c179921914cb1470a 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json @@ -54,7 +54,7 @@ "network_address": "genepi-10.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/37", + "switch_port": "3: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 e2c443fd43475575f041dd9acf37991dbbbd49b0..31ea7c0e0ba75533a7b32b36d4e6107e97e66097 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json @@ -54,7 +54,7 @@ "network_address": "genepi-11.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/9", + "switch_port": "4: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 936db00ca8b80b1d4ccc52bd65d91b50aacf5166..291d56e3fdcd0a21414a70e2e57e835d8208e510 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json @@ -54,7 +54,7 @@ "network_address": "genepi-12.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/38", + "switch_port": "3: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 622251a9e57f856707f456aef558f0e9b252051c..330d1af326d84869582b42b6aec42ab840f76e2e 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json @@ -54,7 +54,7 @@ "network_address": "genepi-13.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/17", + "switch_port": "4: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 1ad15d781dbe42136347e72e4fd848bfe814e0a4..e9554b85bb9e3a625a031a7da8cba5e62ebf594b 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json @@ -54,7 +54,7 @@ "network_address": "genepi-14.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/29", + "switch_port": "3: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 7f7da71398502f96ccc4f961648f0516be7c1988..c686d5d59880216b774149e4295268ff3a15d527 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json @@ -54,7 +54,7 @@ "network_address": "genepi-15.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/7", + "switch_port": "4: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 12c122820d15a390ab286d844b9da63356246211..61a54d68cdc4d7ae8fe57b696750696cef451d61 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json @@ -54,7 +54,7 @@ "network_address": "genepi-16.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/25", + "switch_port": "3: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 fdf328fab06ee1d44785a258c7a7c72a68f5baf9..ab4256966318a713b3581c8f87a6d5de8fb84246 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json @@ -54,7 +54,7 @@ "network_address": "genepi-17.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/6", + "switch_port": "4: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 ee5db4d7252a953681598938b46891bd52a48044..f1a8e28d29473aefa9adefd7d1cb15670fa9b05d 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json @@ -54,7 +54,7 @@ "network_address": "genepi-18.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/27", + "switch_port": "3: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 90872a1f0fe192dd0ba48e5e367f91d76454c5a9..f66f437c22a01f38048e2d2796a95b2cc8596df1 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json @@ -54,7 +54,7 @@ "network_address": "genepi-19.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/16", + "switch_port": "4: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 515b9cea47252b32aa6a3e2b0dd02323105dd83f..9ff37024d1b7de904a33be77e2389524926edcb5 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json @@ -54,7 +54,7 @@ "network_address": "genepi-2.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/42", + "switch_port": "3: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 a467300acf563b847eaa99e2d2bda4976b5e4a44..decdbe3b288d889506fe8bb601034aa09c20a145 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json @@ -54,7 +54,7 @@ "network_address": "genepi-20.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/31", + "switch_port": "3: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 c10de5d099a78a99f85559cbfa0e20b059c045d0..eba4e7a7dd381898818368c7f0f8a6c16341ae30 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json @@ -54,7 +54,7 @@ "network_address": "genepi-21.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/10", + "switch_port": "4: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 e7b1052ddacc2171a762067ca60e753dc042c351..fa898b8000e52242d28e652adb0f11d763504fef 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json @@ -54,7 +54,7 @@ "network_address": "genepi-22.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/32", + "switch_port": "3: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 3d70afba46b9092e2817066d8aee0fa229dc1d60..faa6ed5f7e1cf321a06c7802687553fcefd7bf07 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json @@ -54,7 +54,7 @@ "network_address": "genepi-23.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/14", + "switch_port": "4: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 26dfef971b6e7179a5976b51d596bead2a86e3c6..dd1705c437797cfc86990af3cd7b1e5f3c5d48d8 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json @@ -54,7 +54,7 @@ "network_address": "genepi-24.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/30", + "switch_port": "3: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 35c9122d4b4b2d0a0ed6ed6d72583a64aca431a9..52e8a092bb296f86a8dc099bfb01b31dfdf9fb9d 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json @@ -54,7 +54,7 @@ "network_address": "genepi-25.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/15", + "switch_port": "4: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 2c9b53b3c11a051e2dbad4ebbe61af6c12da5f22..0851ad939f2dd54b995d8f147ea97bba69848549 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json @@ -54,7 +54,7 @@ "network_address": "genepi-26.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/8", + "switch_port": "4: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 dae8baf26b9331dbc395be46292928fb65ed7989..27b0ece3e8c58c0ab9ae5382f4394526a8a261bf 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json @@ -54,7 +54,7 @@ "network_address": "genepi-27.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/4", + "switch_port": "4: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 14b5516aa12d1e8b2d2a50805c7357191b47b66c..730215528beab350013c4305dfe569cc190561d1 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json @@ -54,7 +54,7 @@ "network_address": "genepi-28.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/33", + "switch_port": "3: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 d245701bd47f829fddd0ba5d89c11cc798d50845..553e3e08c2d6f8601346f94315001b3005214197 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json @@ -54,7 +54,7 @@ "network_address": "genepi-29.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/3", + "switch_port": "4: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 83195dfe58b9505f0a5f06db30120808e7b4d69d..cc8e565b1e152ab7082486ef8dcf5799c5466a1f 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json @@ -54,7 +54,7 @@ "network_address": "genepi-3.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/21", + "switch_port": "4: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 6339e023c4f7b7ccab620a7a3b15dbd8471824d4..13c574021474acc19453cb2d1d7ff99c9d7a733e 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json @@ -54,7 +54,7 @@ "network_address": "genepi-30.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/28", + "switch_port": "3: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 7140259dcc5b16c0861d15f22e4dd2964570fbcd..26dd172dac06ac7541faab0bcd32314990bd5635 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json @@ -54,7 +54,7 @@ "network_address": "genepi-31.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/13", + "switch_port": "4: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 0a257edaf2b930ac3f2978fabf99eb259465e76c..cb2df7b8052c844f6159d2e042205e2c28179266 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json @@ -54,7 +54,7 @@ "network_address": "genepi-32.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/34", + "switch_port": "3: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 7547557e888beddcc0897546f6befdcbf0392719..5b59a89767fc8fcdc4e0d978d011433c45b7e4ef 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json @@ -54,7 +54,7 @@ "network_address": "genepi-33.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/5", + "switch_port": "4: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 56a1ee6e61ff6d895326ca38d6a07486d60ab172..08d9ecb1136ff5582603d581aa51a6c3b1132037 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json @@ -54,7 +54,7 @@ "network_address": "genepi-34.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/26", + "switch_port": "3: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 c797bd9d7c097052ed62a21e01695c694d65e31b..df07d04471f85e14fd012b2dcccf0568f9573e83 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json @@ -54,7 +54,7 @@ "network_address": "genepi-4.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/40", + "switch_port": "3: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 d133b42f33b3b11060f4beca782a04d460386568..dd8e1c0d5120ee6e7c2d0c0966a00cb4309141f4 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json @@ -54,7 +54,7 @@ "network_address": "genepi-5.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/19", + "switch_port": "4: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 c18cf4bfaf95aad672b4633a7cfa572f37e71f7c..c2d527268828dcdf9b370a72eb7556bfe7039d62 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json @@ -54,7 +54,7 @@ "network_address": "genepi-6.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi", + "switch_port": null, "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 8200693ba62e8b91e57483e311ef0b7735233a8a..67895bc1032ce6989c606cdbcb679671fd0940ac 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json @@ -54,7 +54,7 @@ "network_address": "genepi-7.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/20", + "switch_port": "4: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 6c0cbb15a6d8b044b45f5d04faa76a448c312113..4d17f8d7f1513f2acb629bb1971629308bfd536f 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json @@ -54,7 +54,7 @@ "network_address": "genepi-8.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi3/39", + "switch_port": "3: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 927a6de99af5af4eb3f1856ed60218510e41f1ab..71450917712197ea8300d571a17d67c77629c319 100755 --- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json +++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json @@ -54,7 +54,7 @@ "network_address": "genepi-9.grenoble.grid5000.fr", "rate": 1000000000, "switch": "gw-grenoble", - "switch_port": "Gi4/18", + "switch_port": "4:18", "vendor": "Intel", "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)" }, diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis.yaml index 5e4352eea7acd1938903416ef8ac10fc0c7276a2..251f96aa579199e1d517d0d755ad6531ff40e4bd 100644 --- a/generators/input/sites/grenoble/clusters/adonis.yaml +++ b/generators/input/sites/grenoble/clusters/adonis.yaml @@ -40,7 +40,7 @@ adonis-1: mountable: true ip: 172.16.18.1 switch_name: gw-grenoble - switch_port: Gi3/11 + switch_port: '3:11' eth1: mounted: false mac: 00:30:48:cc:7f:d9 @@ -119,7 +119,7 @@ adonis-2: mountable: true ip: 172.16.18.2 switch_name: gw-grenoble - switch_port: Gi3/12 + switch_port: '3:12' eth1: mounted: false mac: 00:30:48:cc:7f:db @@ -187,7 +187,7 @@ adonis-3: mountable: true ip: 172.16.18.3 switch_name: gw-grenoble - switch_port: Gi3/13 + switch_port: '3:13' eth1: mounted: false mac: 00:30:48:cd:c6:a5 @@ -276,7 +276,7 @@ adonis-4: mountable: true ip: 172.16.18.4 switch_name: gw-grenoble - switch_port: Gi3/14 + switch_port: '3:14' eth1: mounted: false mac: 00:30:48:cd:c0:ad @@ -344,7 +344,7 @@ adonis-5: mountable: true ip: 172.16.18.5 switch_name: gw-grenoble - switch_port: Gi3/15 + switch_port: '3:15' eth1: mounted: false mac: 00:30:48:cc:7e:0b @@ -423,7 +423,7 @@ adonis-6: mountable: true ip: 172.16.18.6 switch_name: gw-grenoble - switch_port: Gi3/16 + switch_port: '3:16' eth1: mounted: false mac: 00:30:48:cc:7a:bd @@ -509,7 +509,7 @@ adonis-7: mountable: true ip: 172.16.18.7 switch_name: gw-grenoble - switch_port: Gi3/17 + switch_port: '3:17' eth1: mounted: false mac: 00:30:48:cd:c6:81 @@ -592,7 +592,7 @@ adonis-8: mountable: true ip: 172.16.18.8 switch_name: gw-grenoble - switch_port: Gi3/18 + switch_port: '3:18' eth1: mounted: false mac: 00:30:48:cd:c0:af @@ -660,7 +660,7 @@ adonis-9: mountable: true ip: 172.16.18.9 switch_name: gw-grenoble - switch_port: Gi3/19 + switch_port: '3:19' eth1: mounted: false mac: 00:25:90:4c:e9:85 @@ -743,7 +743,7 @@ adonis-10: mountable: true ip: 172.16.18.10 switch_name: gw-grenoble - switch_port: Gi3/20 + switch_port: '3:20' eth1: mounted: false mac: 00:30:48:cc:83:11 diff --git a/generators/input/sites/grenoble/clusters/genepi.yaml b/generators/input/sites/grenoble/clusters/genepi.yaml index 88798b5c421b27cce4b435cf6c0a1e7ad1b8666f..45e30da0eb481920d28d3860fe25caa55cb50e41 100644 --- a/generators/input/sites/grenoble/clusters/genepi.yaml +++ b/generators/input/sites/grenoble/clusters/genepi.yaml @@ -59,7 +59,7 @@ genepi-1: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/22 + switch_port: '4:22' bmc: mac: 00:30:48:96:d6:b5 ip: 172.17.16.1 @@ -135,7 +135,7 @@ genepi-2: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/42 + switch_port: '3:42' bmc: mac: 00:30:48:96:d1:e2 ip: 172.17.16.2 @@ -222,7 +222,7 @@ genepi-3: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/21 + switch_port: '4:21' bmc: mac: 00:30:48:96:d3:44 ip: 172.17.16.3 @@ -320,7 +320,7 @@ genepi-4: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/40 + switch_port: '3:40' bmc: mac: 00:30:48:96:d2:5d ip: 172.17.16.4 @@ -396,7 +396,7 @@ genepi-5: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/19 + switch_port: '4:19' bmc: mac: 00:30:48:93:39:e8 ip: 172.17.16.5 @@ -490,7 +490,7 @@ genepi-6: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi + switch_port: bmc: mac: ip: 172.17.16.6 @@ -577,7 +577,7 @@ genepi-7: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/20 + switch_port: '4:20' bmc: mac: 00:30:48:96:d1:d2 ip: 172.17.16.7 @@ -668,7 +668,7 @@ genepi-8: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/39 + switch_port: '3:39' bmc: mac: 00:30:48:96:d6:94 ip: 172.17.16.8 @@ -748,7 +748,7 @@ genepi-9: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/18 + switch_port: '4:18' bmc: mac: 00:30:48:96:d4:8e ip: 172.17.16.9 @@ -838,7 +838,7 @@ genepi-10: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/37 + switch_port: '3:37' bmc: mac: 00:30:48:96:d4:2d ip: 172.17.16.10 @@ -925,7 +925,7 @@ genepi-11: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/9 + switch_port: '4:9' bmc: mac: 00:30:48:96:d6:90 ip: 172.17.16.11 @@ -1012,7 +1012,7 @@ genepi-12: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/38 + switch_port: '3:38' bmc: mac: ip: 172.17.16.12 @@ -1096,7 +1096,7 @@ genepi-13: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/17 + switch_port: '4:17' bmc: mac: 00:30:48:96:d4:9a ip: 172.17.16.13 @@ -1190,7 +1190,7 @@ genepi-14: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/29 + switch_port: '3:29' bmc: mac: 00:30:48:96:d3:40 ip: 172.17.16.14 @@ -1266,7 +1266,7 @@ genepi-15: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/7 + switch_port: '4:7' bmc: mac: 00:30:48:96:d3:2f ip: 172.17.16.15 @@ -1353,7 +1353,7 @@ genepi-16: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/25 + switch_port: '3:25' bmc: mac: 00:30:48:96:d4:37 ip: 172.17.16.16 @@ -1444,7 +1444,7 @@ genepi-17: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/6 + switch_port: '4:6' bmc: mac: 00:30:48:96:d2:42 ip: 172.17.16.17 @@ -1534,7 +1534,7 @@ genepi-18: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/27 + switch_port: '3:27' bmc: mac: 00:30:48:96:d3:4d ip: 172.17.16.18 @@ -1621,7 +1621,7 @@ genepi-19: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/16 + switch_port: '4:16' bmc: mac: 00:30:48:96:d1:f5 ip: 172.17.16.19 @@ -1705,7 +1705,7 @@ genepi-20: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/31 + switch_port: '3:31' bmc: mac: 00:30:48:96:d3:bf ip: 172.17.16.20 @@ -1795,7 +1795,7 @@ genepi-21: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/10 + switch_port: '4:10' bmc: mac: 00:30:48:96:d3:56 ip: 172.17.16.21 @@ -1879,7 +1879,7 @@ genepi-22: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/32 + switch_port: '3:32' bmc: mac: 00:30:48:96:d2:fd ip: 172.17.16.22 @@ -1973,7 +1973,7 @@ genepi-23: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/14 + switch_port: '4:14' bmc: mac: 00:30:48:96:d2:d1 ip: 172.17.16.23 @@ -2049,7 +2049,7 @@ genepi-24: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/30 + switch_port: '3:30' bmc: mac: 00:30:48:96:d6:ff ip: 172.17.16.24 @@ -2147,7 +2147,7 @@ genepi-25: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/15 + switch_port: '4:15' bmc: mac: 00:30:48:96:d3:2d ip: 172.17.16.25 @@ -2230,7 +2230,7 @@ genepi-26: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/8 + switch_port: '4:8' bmc: mac: 00:30:48:96:d6:08 ip: 172.17.16.26 @@ -2321,7 +2321,7 @@ genepi-27: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/4 + switch_port: '4:4' bmc: mac: 00:30:48:96:d3:1f ip: 172.17.16.27 @@ -2397,7 +2397,7 @@ genepi-28: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/33 + switch_port: '3:33' bmc: mac: 00:30:48:96:d7:76 ip: 172.17.16.28 @@ -2484,7 +2484,7 @@ genepi-29: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/3 + switch_port: '4:3' bmc: mac: 00:30:48:96:d2:db ip: 172.17.16.29 @@ -2571,7 +2571,7 @@ genepi-30: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/28 + switch_port: '3:28' bmc: mac: 00:30:48:96:d4:2f ip: 172.17.16.30 @@ -2658,7 +2658,7 @@ genepi-31: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/13 + switch_port: '4:13' bmc: mac: ip: 172.17.16.31 @@ -2745,7 +2745,7 @@ genepi-32: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/34 + switch_port: '3:34' bmc: mac: 00:30:48:96:d7:84 ip: 172.17.16.32 @@ -2832,7 +2832,7 @@ genepi-33: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi4/5 + switch_port: '4:5' bmc: mac: 00:30:48:96:d2:dc ip: 172.17.16.33 @@ -2926,7 +2926,7 @@ genepi-34: driver: e1000e mountable: true switch_name: gw-grenoble - switch_port: Gi3/26 + switch_port: '3:26' bmc: mac: 00:30:48:96:d2:dd ip: 172.17.16.34