From 7b98df7c350b2450b35cb87c4ce8477a1bc21289 Mon Sep 17 00:00:00 2001 From: Simon Delamare Date: Fri, 27 Jun 2014 17:13:26 +0200 Subject: [PATCH] [lille] Use network lookup functions (Florentin work) --- .../sites/lille/clusters/chimint/nodes/chimint-1.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-10.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-11.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-12.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-13.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-14.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-15.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-16.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-17.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-18.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-19.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-2.json | 6 ++---- .../lille/clusters/chimint/nodes/chimint-20.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-3.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-4.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-5.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-6.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-7.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-8.json | 6 ++---- .../sites/lille/clusters/chimint/nodes/chimint-9.json | 6 ++---- .../lille/clusters/chinqchint/nodes/chinqchint-1.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-10.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-11.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-12.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-13.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-14.json | 7 +++---- .../clusters/chinqchint/nodes/chinqchint-15.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-16.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-17.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-18.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-19.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-2.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-20.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-21.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-22.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-23.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-24.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-25.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-26.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-27.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-28.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-29.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-3.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-30.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-31.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-32.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-33.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-34.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-35.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-36.json | 7 +++---- .../clusters/chinqchint/nodes/chinqchint-37.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-38.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-39.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-4.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-40.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-41.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-42.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-43.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-44.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-45.json | 5 ++--- .../clusters/chinqchint/nodes/chinqchint-46.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-5.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-6.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-7.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-8.json | 5 ++--- .../lille/clusters/chinqchint/nodes/chinqchint-9.json | 5 ++--- .../lille/clusters/chirloute/nodes/chirloute-1.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-2.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-3.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-4.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-5.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-6.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-7.json | 3 +-- .../lille/clusters/chirloute/nodes/chirloute-8.json | 3 +-- generators/input/sites/lille/clusters/chimint.rb | 6 ++---- generators/input/sites/lille/clusters/chinqchint.rb | 5 ++--- generators/input/sites/lille/clusters/chirloute.rb | 11 +++++------ 77 files changed, 151 insertions(+), 249 deletions(-) diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json index a0260b95ee..3dd1d90c3d 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json @@ -40,7 +40,7 @@ "network_address": "chimint-1.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/7", + "switch_port": "GigabitEthernet3/7", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-1-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json index a0ba1ece29..b2eabf7470 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json @@ -40,7 +40,7 @@ "network_address": "chimint-10.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/16", + "switch_port": "GigabitEthernet3/16", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-10-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json index ec007c03ad..a15283415b 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json @@ -40,7 +40,7 @@ "network_address": "chimint-11.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/17", + "switch_port": "GigabitEthernet3/17", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-11-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json index a1a43e7c7c..fb3bfe237c 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json @@ -40,7 +40,7 @@ "network_address": "chimint-12.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/18", + "switch_port": "GigabitEthernet3/18", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-12-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json index 28d86e759a..af6d0cc253 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json @@ -40,7 +40,7 @@ "network_address": "chimint-13.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/19", + "switch_port": "GigabitEthernet3/19", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-13-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json index 1d646337a5..c7127814f2 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json @@ -40,7 +40,7 @@ "network_address": "chimint-14.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/20", + "switch_port": "GigabitEthernet3/20", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-14-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json index c15c826e56..42f618b90e 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json @@ -40,7 +40,7 @@ "network_address": "chimint-15.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/23", + "switch_port": "GigabitEthernet3/23", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-15-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json index 964c946d4e..3463adc875 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json @@ -40,7 +40,7 @@ "network_address": "chimint-16.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/22", + "switch_port": "GigabitEthernet3/22", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-16-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json index e4f1e8ac47..a69bad1036 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json @@ -40,7 +40,7 @@ "network_address": "chimint-17.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/21", + "switch_port": "GigabitEthernet3/21", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-17-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json index a030a64315..eaf3430b13 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json @@ -40,7 +40,7 @@ "network_address": "chimint-18.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/24", + "switch_port": "GigabitEthernet3/24", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-18-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json index 443d183e06..1fb849ee0d 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json @@ -40,7 +40,7 @@ "network_address": "chimint-19.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/28", + "switch_port": "GigabitEthernet3/28", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-19-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json index 4e1c4aeb90..484565cfdc 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json @@ -40,7 +40,7 @@ "network_address": "chimint-2.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/9", + "switch_port": "GigabitEthernet3/9", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-2-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json index 56f3197093..d209a7e4d3 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json @@ -40,7 +40,7 @@ "network_address": "chimint-20.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/27", + "switch_port": "GigabitEthernet3/27", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-20-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json index 840486aaa7..2f5d624eaf 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json @@ -40,7 +40,7 @@ "network_address": "chimint-3.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/8", + "switch_port": "GigabitEthernet3/8", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-3-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json index 6c78b96db7..df05ab28b1 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json @@ -40,7 +40,7 @@ "network_address": "chimint-4.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/11", + "switch_port": "GigabitEthernet3/11", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-4-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json index 95d3826e2f..847b779206 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json @@ -40,7 +40,7 @@ "network_address": "chimint-5.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/10", + "switch_port": "GigabitEthernet3/10", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-5-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json index 19e19e7dad..4091c67afe 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json @@ -40,7 +40,7 @@ "network_address": "chimint-6.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/12", + "switch_port": "GigabitEthernet3/12", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-6-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json index 2243b25d3c..cad1eaeb06 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json @@ -40,7 +40,7 @@ "network_address": "chimint-7.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/14", + "switch_port": "GigabitEthernet3/14", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-7-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json index edb59ed58a..30be613199 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json @@ -40,7 +40,7 @@ "network_address": "chimint-8.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/13", + "switch_port": "GigabitEthernet3/13", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-8-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json index 6b104895a3..1af42222c9 100644 --- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json +++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json @@ -40,7 +40,7 @@ "network_address": "chimint-9.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/15", + "switch_port": "GigabitEthernet3/15", "vendor": "Broadcom", "version": "NetXtreme II BCM5716" }, @@ -68,9 +68,7 @@ "mountable": false, "mounted": false, "network_address": "chimint-9-impi.lille.grid5000.fr", - "rate": 1000000000, - "switch": null, - "switch_port": null + "rate": 1000000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json index 7f3891bd13..0b13b9a565 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-1.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/1", + "switch_port": "GigabitEthernet2/1", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-1-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json index a672d21140..4b8ea4ea88 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-10.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/10", + "switch_port": "GigabitEthernet2/10", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-10-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json index c633f9ceeb..830934eb55 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-11.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/11", + "switch_port": "GigabitEthernet2/11", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-11-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json index f929a32666..a23697e618 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-12.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/12", + "switch_port": "GigabitEthernet2/12", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-12-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json index 2fa467a600..52ba6820f0 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-13.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/26", + "switch_port": "GigabitEthernet2/13", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-13-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json index 646d853249..f17c7019f0 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json @@ -55,8 +55,8 @@ "mounted": true, "network_address": "chinqchint-14.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", - "switch_port": "Gi4/29", + "switch": null, + "switch_port": null, "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-14-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json index 9e2075e949..e407a65a99 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-15.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/15", + "switch_port": "GigabitEthernet2/15", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-15-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json index 55d6a8d287..db52f8d3cd 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-16.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/16", + "switch_port": "GigabitEthernet2/16", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-16-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json index 90bf2a1512..7f0887904b 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-17.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/17", + "switch_port": "GigabitEthernet2/17", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-17-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json index 8fe1ca12f2..f08d73904c 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-18.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/18", + "switch_port": "GigabitEthernet2/18", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-18-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json index 3b156a5def..291c2d6058 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-19.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/19", + "switch_port": "GigabitEthernet2/19", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-19-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json index a36459972a..279d644b70 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-2.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/2", + "switch_port": "GigabitEthernet2/2", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-2-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json index 72c6ed6238..a73c5ce4b5 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-20.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/20", + "switch_port": "GigabitEthernet2/20", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-20-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json index c497627c31..3eab49688b 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-21.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/21", + "switch_port": "GigabitEthernet2/21", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-21-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json index 96a6a786d6..efdbb5f73e 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-22.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/22", + "switch_port": "GigabitEthernet2/22", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-22-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json index 2cf73e88ce..722c78a5de 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-23.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/23", + "switch_port": "GigabitEthernet2/23", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-23-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json index 188de99633..b97c225600 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-24.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/24", + "switch_port": "GigabitEthernet2/24", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-24-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json index 106f03ca5a..d3b2f21fb0 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-25.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/25", + "switch_port": "GigabitEthernet2/25", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-25-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json index dad40b5a8c..ab7a9328e2 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-26.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/26", + "switch_port": "GigabitEthernet2/26", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-26-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json index 58db05b6f9..70abc23a33 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-27.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/27", + "switch_port": "GigabitEthernet2/27", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-27-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json index fdc25c4b98..4e986a59db 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-28.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/28", + "switch_port": "GigabitEthernet2/28", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-28-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json index 55a1ffccbc..02de45706a 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-29.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/29", + "switch_port": "GigabitEthernet2/29", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-29-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json index 3f32fce2c4..b7c9816b12 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-3.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/3", + "switch_port": "GigabitEthernet2/3", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-3-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json index cb886c3b88..449fc88149 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-30.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/30", + "switch_port": "GigabitEthernet2/30", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-30-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json index 18dd7b828a..4c8d5894d1 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-31.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/31", + "switch_port": "GigabitEthernet2/31", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-31-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json index 2cf68fc242..1aa617289f 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-32.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/32", + "switch_port": "GigabitEthernet2/32", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-32-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json index 45e6bb75f2..3607cf785e 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-33.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/33", + "switch_port": "GigabitEthernet2/33", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-33-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json index 297dfec4aa..c6b4b4609c 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-34.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/30", + "switch_port": "GigabitEthernet2/34", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-34-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json index 5c021cf5eb..7619a9bcaa 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-35.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/31", + "switch_port": "GigabitEthernet2/35", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-35-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json index ab0dfbea44..c9cc907cc4 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json @@ -55,8 +55,8 @@ "mounted": true, "network_address": "chinqchint-36.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", - "switch_port": "Gi4/28", + "switch": null, + "switch_port": null, "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-36-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json index 0ed89fc1c8..8d8edf77ac 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-37.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/37", + "switch_port": "GigabitEthernet2/37", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-37-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json index 1c38dfbcca..a8b73da496 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-38.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/38", + "switch_port": "GigabitEthernet2/38", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-38-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json index fe2aafff1c..9ff13b3807 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-39.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/39", + "switch_port": "GigabitEthernet2/39", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-39-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json index d01bef3bda..aa311ac881 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-4.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/4", + "switch_port": "GigabitEthernet2/4", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-4-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json index 10370e6e60..11c374a6d6 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-40.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/40", + "switch_port": "GigabitEthernet2/40", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-40-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json index 07c788b860..9c191e3d71 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-41.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/1", + "switch_port": "GigabitEthernet3/1", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-41-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json index 007c77c789..1df982574d 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-42.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/2", + "switch_port": "GigabitEthernet3/2", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-42-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json index f531e131f4..7720a1b891 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-43.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/3", + "switch_port": "GigabitEthernet3/3", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-43-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json index 1559e7692e..b31fd48d8e 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-44.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/4", + "switch_port": "GigabitEthernet3/4", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-44-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json index 58ba18a9f8..68e4bd48bd 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-45.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/5", + "switch_port": "GigabitEthernet3/5", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-45-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json index 764b458f6a..62cf92ebb7 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-46.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/41", + "switch_port": "GigabitEthernet3/41", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-46-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json index c0918beef3..16b9f4d719 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-5.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/5", + "switch_port": "GigabitEthernet2/41", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-5-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json index fdfb858468..387d855614 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-6.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/6", + "switch_port": "GigabitEthernet2/6", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-6-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json index 2d135d107d..62b215cbf1 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-7.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/7", + "switch_port": "GigabitEthernet2/7", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-7-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json index f1c75f2ec9..286799a6f5 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-8.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/8", + "switch_port": "GigabitEthernet2/8", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-8-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json index b517faea7b..b16a1c218f 100755 --- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json +++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json @@ -56,7 +56,7 @@ "network_address": "chinqchint-9.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi2/9", + "switch_port": "GigabitEthernet2/9", "vendor": "Intel", "version": "80003ES2LAN" }, @@ -87,8 +87,7 @@ "mountable": false, "mounted": false, "network_address": "chinqchint-9-ipmi.lille.grid5000.fr", - "rate": 100000000, - "switch": "gw-lille" + "rate": 100000000 } ], "operating_system": { diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json index 79d8f0cbe2..7dd10adcc7 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json @@ -60,7 +60,7 @@ "network_address": "chirloute-1.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/25", + "switch_port": "GigabitEthernet3/29", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-1-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json index 902fa3c583..78cddbb4a2 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json @@ -60,7 +60,7 @@ "network_address": "chirloute-2.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/25", + "switch_port": "GigabitEthernet3/25", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-2-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json index ee822b1dfc..60d71500fd 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json @@ -60,7 +60,7 @@ "network_address": "chirloute-3.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/44", + "switch_port": "GigabitEthernet3/30", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-3-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json index 070c2e2470..e85b8e7223 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json @@ -60,7 +60,7 @@ "network_address": "chirloute-4.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/26", + "switch_port": "GigabitEthernet3/26", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-4-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json index 0526bf340c..ff817b7111 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json @@ -60,7 +60,7 @@ "network_address": "chirloute-5.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/23", + "switch_port": "GigabitEthernet3/33", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-5-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json index 72201c2a05..fb1c59b2d1 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json @@ -60,7 +60,7 @@ "network_address": "chirloute-6.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/31", + "switch_port": "GigabitEthernet3/31", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-6-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json index 0afc62a121..87257235ce 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json @@ -60,7 +60,7 @@ "network_address": "chirloute-7.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi4/23", + "switch_port": "GigabitEthernet4/23", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-7-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json index 704d83a84a..d581bb55ca 100644 --- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json +++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json @@ -60,7 +60,7 @@ "network_address": "chirloute-8.lille.grid5000.fr", "rate": 1000000000, "switch": "gw-lille", - "switch_port": "Gi3/32", + "switch_port": "GigabitEthernet3/32", "vendor": "Intel", "version": "82576EB" }, @@ -75,7 +75,6 @@ "mounted": false, "network_address": "chirloute-8-ipmi.lille.grid5000.fr", "rate": 1000000000, - "switch": "gw-lille", "vendor": "Inventec", "version": 1.14 } diff --git a/generators/input/sites/lille/clusters/chimint.rb b/generators/input/sites/lille/clusters/chimint.rb index bf034e2cf3..09eb649271 100644 --- a/generators/input/sites/lille/clusters/chimint.rb +++ b/generators/input/sites/lille/clusters/chimint.rb @@ -75,10 +75,10 @@ site :lille do |site_uid| :vendor => 'Broadcom', :version => 'NetXtreme II BCM5716', :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", - :switch => 'gw-lille', + :switch => net_switch_lookup('lille', 'chimint', node_uid, 'eth0'), + :switch_port => net_port_lookup('lille', 'chimint', node_uid, 'eth0'), :ip => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'ip'), :ip6 => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'), - :switch_port => lookup('chimint_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'), :driver => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'driver'), :mac => lookup('chimint_generated', node_uid, 'network_interfaces', 'eth0', 'mac') }, @@ -102,8 +102,6 @@ site :lille do |site_uid| :network_address => "#{node_uid}-impi.#{site_uid}.grid5000.fr", :ip => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'ip'), :mac => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'mac'), - :switch => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'switch_name'), - :switch_port => lookup('chimint_generated', node_uid, 'network_interfaces', 'bmc', 'switch_port'), :enabled => true, :mounted => false, :mountable => false, diff --git a/generators/input/sites/lille/clusters/chinqchint.rb b/generators/input/sites/lille/clusters/chinqchint.rb index 03c09f02fd..650d346ff8 100644 --- a/generators/input/sites/lille/clusters/chinqchint.rb +++ b/generators/input/sites/lille/clusters/chinqchint.rb @@ -90,8 +90,8 @@ site :lille do |site_uid| :vendor => 'Intel', :version => '80003ES2LAN', :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", - :switch => 'gw-lille', - :switch_port => lookup('chinqchint_manual',"#{node_uid}",'network_interfaces', 'eth1', 'switch_port'), + :switch => net_switch_lookup('lille', 'chinqchint', node_uid, 'eth1'), + :switch_port => net_port_lookup('lille', 'chinqchint', node_uid, 'eth1'), :ip => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'ip'), :ip6 => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'), :driver => lookup('chinqchint_generated', node_uid, 'network_interfaces', 'eth1', 'driver'), @@ -126,7 +126,6 @@ site :lille do |site_uid| :mountable => false, :management => true, :device => "bmc", - :switch => 'gw-lille' }] chassis({ diff --git a/generators/input/sites/lille/clusters/chirloute.rb b/generators/input/sites/lille/clusters/chirloute.rb index 995ea693ab..bd56e1e564 100644 --- a/generators/input/sites/lille/clusters/chirloute.rb +++ b/generators/input/sites/lille/clusters/chirloute.rb @@ -81,7 +81,7 @@ site :lille do |site_uid| :bridged => false, :device => "eth0", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", - :switch => 'gw-lille', + :switch => "gw-lille", :driver => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'driver'), :ip => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'ip'), :mac => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth0', 'mac') @@ -101,8 +101,8 @@ site :lille do |site_uid| :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'ip'), :ip6 => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'ip6'), - :switch => 'gw-lille', - :switch_port => lookup('chirloute_manual', node_uid, 'network_interfaces', 'eth1', 'switch_port'), + :switch => net_switch_lookup('lille', 'chirloute', node_uid, 'eth1'), + :switch_port => net_port_lookup('lille', 'chirloute', node_uid, 'eth1'), :mac => lookup('chirloute_generated', node_uid, 'network_interfaces', 'eth1', 'mac') }, { @@ -116,10 +116,9 @@ site :lille do |site_uid| :mounted => false, :mountable => false, :management => true, - :switch => 'gw-lille', :device => "bmc", - :vendor => "Inventec", - :version => 1.14 + :vendor => "Inventec", + :version => 1.14 }] -- GitLab