From b76f52c0f977cd3c9c859c72aa2abea4caec2cc4 Mon Sep 17 00:00:00 2001 From: David Loup Date: Wed, 12 Sep 2018 18:09:50 +0200 Subject: [PATCH] Base commit for kavlan on gw2.grenoble (sw-imag) --- .../grenoble/clusters/dahu/nodes/dahu-1.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-10.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-11.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-12.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-13.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-14.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-15.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-16.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-17.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-18.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-19.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-2.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-20.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-21.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-22.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-23.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-24.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-25.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-26.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-27.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-28.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-29.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-3.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-30.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-31.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-32.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-4.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-5.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-6.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-7.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-8.json | 4 +- .../grenoble/clusters/dahu/nodes/dahu-9.json | 4 +- .../grenoble/clusters/yeti/nodes/yeti-1.json | 4 +- .../grenoble/clusters/yeti/nodes/yeti-2.json | 4 +- .../grenoble/clusters/yeti/nodes/yeti-3.json | 4 +- .../grenoble/clusters/yeti/nodes/yeti-4.json | 4 +- .../network_equipments/gw2-grenoble.json | 336 ++++++++++++++++++ .../sites/grenoble/networks/gw2-grenoble.yaml | 128 +++++++ 38 files changed, 536 insertions(+), 72 deletions(-) create mode 100644 data/grid5000/sites/grenoble/network_equipments/gw2-grenoble.json create mode 100644 input/grid5000/sites/grenoble/networks/gw2-grenoble.yaml diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json index e69db15675..1a6843b91a 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-1.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 1", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json index 52ad8b9f53..f708b76fe0 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-10.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 10", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json index d726772796..40e8b5ff45 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-11.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 11", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json index cf5fb866c3..b0d2d955c2 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-12.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 12", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json index 79a95a2f02..d000eab21e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-13.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 13", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json index 53dec48a1d..507360c75e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-14.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 14", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json index 192dc23f56..9ed5269c6e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-15.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 15", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json index b2c7e05d20..7137d2bd0b 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-16.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 16", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json index b12083e324..ea9e57819d 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-17.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 17", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json index 31388db092..5b803b6575 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-18.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 18", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json index 86493c79ed..fb5ee8b037 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-19.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 19", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json index a3eff7311b..91ae9b99b8 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-2.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 2", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json index 4dcd4dd8e1..3b11ca4e1b 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-20.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 20", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json index c5e39f53a5..5ccda31d71 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-21.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 21", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json index 09e4363f9c..a39ce5ce8a 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-22.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 22", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json index 82fe113660..5e1a904bcd 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-23.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 23", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json index 09e0a75beb..27eca793cb 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-24.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 24", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json index d41e9769d3..77fd6f20ca 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-25.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 25", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json index 303beb253f..4fb777b141 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-26.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 26", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json index 0cf906ed08..824a1e02d0 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-27.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 27", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json index 63c1e49252..b90c595035 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-28.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 28", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json index e919ec0d05..77187fb37c 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-29.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 29", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json index 760c06545a..2881685786 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-3.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 3", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json index 2655067a01..48f87e333c 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-30.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 30", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json index c31085f453..32be663960 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-31.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 31", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json index d6228a113a..8ba1b779ef 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-32.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 32", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json index 8bc40ba885..599d1ab0ea 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-4.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 4", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json index acfed0f69e..d6901ac93c 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-5.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 5", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json index 36e9387646..00e59d0298 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-6.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 6", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json index 3b8582381b..ea9abeca1e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-7.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 7", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json index f9b799ed92..51d2d26cfb 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-8.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 8", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json index 636248ced6..5f5eea4dee 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json @@ -62,8 +62,8 @@ "name": "enp24s0f0", "network_address": "dahu-9.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 9", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json index 8ab2314eb2..d87f5ce189 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json @@ -62,8 +62,8 @@ "name": "eno113", "network_address": "yeti-1.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 33", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json index b69a9ee488..31e6c4c5c3 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json @@ -62,8 +62,8 @@ "name": "eno113", "network_address": "yeti-2.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 34", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json index 5b0b97b1ab..df92762ce2 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json @@ -62,8 +62,8 @@ "name": "eno113", "network_address": "yeti-3.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 35", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json index ddd9009079..f1395d4902 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json @@ -62,8 +62,8 @@ "name": "eno113", "network_address": "yeti-4.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null, + "switch": "gw2-grenoble", + "switch_port": "X670V-48x Port 36", "vendor": "Intel" }, { diff --git a/data/grid5000/sites/grenoble/network_equipments/gw2-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/gw2-grenoble.json new file mode 100644 index 0000000000..2bc9fafb44 --- /dev/null +++ b/data/grid5000/sites/grenoble/network_equipments/gw2-grenoble.json @@ -0,0 +1,336 @@ +{ + "alias": [ + "sw-imag" + ], + "backplane_bps": 800000000000, + "kind": "router", + "linecards": [ + { + "backplane_bps": 48000000000, + "kavlan_pattern": "%PORT%", + "kind": "node", + "port": "eth0", + "ports": [ + { + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-1" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-2" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-3" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-4" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-5" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-6" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-7" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-8" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-9" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-10" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-11" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-12" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-13" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-14" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-15" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-16" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-17" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-18" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-19" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-20" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-21" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-22" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-23" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-24" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-25" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-26" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-27" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-28" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-29" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-30" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-31" + }, + { + "kind": "node", + "port": "eth0", + "uid": "dahu-32" + }, + { + "kind": "node", + "port": "eth0", + "uid": "yeti-1" + }, + { + "kind": "node", + "port": "eth0", + "uid": "yeti-2" + }, + { + "kind": "node", + "port": "eth0", + "uid": "yeti-3" + }, + { + "kind": "node", + "port": "eth0", + "uid": "yeti-4" + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "other", + "port": "eth0", + "uid": "dighyp1" + }, + { + "kind": "other", + "port": "eth0", + "uid": "dighyp2" + }, + { + "kind": "other", + "port": "eth0", + "uid": "digsed" + }, + { + "kind": "other", + "port": "eth0", + "uid": "digsed" + }, + { + "kind": "other", + "port": "eth0", + "uid": "digwatt" + }, + { + }, + { + }, + { + "kind": "other", + "port": "eth0", + "uid": "renater5" + } + ], + "rate": 10000000000, + "snmp_pattern": "X670V-48x Port %PORT%" + } + ], + "model": "ExtremeNetworks", + "mtu": 9216, + "sensors": { + "network": { + "available": true, + "resolution": 1 + } + }, + "site": "grenoble", + "snmp_community": "public", + "type": "network_equipment", + "uid": "gw2-grenoble", + "vlans": { + "vlan100": { + "addresses": [ + "172.16.31.254" + ], + "administrative": true + }, + "vlan101": { + "addresses": [ + "172.17.31.254" + ] + }, + "vlan500": { + "addresses": [ + "192.168.4.15" + ] + }, + "vlan701": { + "addresses": [ + "192.168.192.0/20" + ], + "name": "kavlan-1" + }, + "vlan702": { + "addresses": [ + "192.168.208.0/20" + ], + "name": "kavlan-2" + }, + "vlan703": { + "addresses": [ + "192.168.224.0/20" + ], + "name": "kavlan-3" + }, + "vlan704": { + "addresses": [ + "10.4.0.0/18" + ], + "name": "kavlan-4" + }, + "vlan705": { + "addresses": [ + "10.4.64.0/18" + ], + "name": "kavlan-5" + }, + "vlan706": { + "addresses": [ + "10.4.128.0/18" + ], + "name": "kavlan-6" + }, + "vlan707": { + "addresses": [ + "10.4.192.0/18" + ], + "name": "kavlan-7" + }, + "vlan708": { + "addresses": [ + "10.5.0.0/18" + ], + "name": "kavlan-8" + }, + "vlan709": { + "addresses": [ + "10.5.64.0/18" + ], + "name": "kavlan-9" + }, + "vlan711": { + "addresses": [ + "10.7.192.0/18" + ], + "name": "kavlan-11" + } + }, + "warranty": "expired", + "weathermap": { + } +} \ No newline at end of file diff --git a/input/grid5000/sites/grenoble/networks/gw2-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw2-grenoble.yaml new file mode 100644 index 0000000000..c5f47c0f03 --- /dev/null +++ b/input/grid5000/sites/grenoble/networks/gw2-grenoble.yaml @@ -0,0 +1,128 @@ +--- +gw2-grenoble: + model: ExtremeNetworks + kind: router + alias: [sw-imag] + site: grenoble + warranty: expired + backplane_bps: 800000000000 + mtu: 9216 + snmp_community: public + sensors: + network: + available: true + resolution: 1 + vlans: + "vlan100": + administrative: yes + addresses: + - 172.16.31.254 + "vlan101": + addresses: + - 172.17.31.254 + "vlan500": + addresses: + - 192.168.4.15 + "vlan701": + name: kavlan-1 + addresses: + - 192.168.192.0/20 + "vlan702": + name: kavlan-2 + addresses: + - 192.168.208.0/20 + "vlan703": + name: kavlan-3 + addresses: + - 192.168.224.0/20 + "vlan704": + name: kavlan-4 + addresses: + - 10.4.0.0/18 + "vlan705": + name: kavlan-5 + addresses: + - 10.4.64.0/18 + "vlan706": + name: kavlan-6 + addresses: + - 10.4.128.0/18 + "vlan707": + name: kavlan-7 + addresses: + - 10.4.192.0/18 + "vlan708": + name: kavlan-8 + addresses: + - 10.5.0.0/18 + "vlan709": + name: kavlan-9 + addresses: + - 10.5.64.0/18 + "vlan711": + name: kavlan-11 + addresses: + - 10.7.192.0/18 + linecards: + 0: + snmp_pattern: "X670V-48x Port %PORT%" + kavlan_pattern: "%PORT%" + backplane_bps: 48000000000 + kind: node + port: eth0 + rate: 10000000000 + ports: + 1: dahu-1 + 2: dahu-2 + 3: dahu-3 + 4: dahu-4 + 5: dahu-5 + 6: dahu-6 + 7: dahu-7 + 8: dahu-8 + 9: dahu-9 + 10: dahu-10 + 11: dahu-11 + 12: dahu-12 + 13: dahu-13 + 14: dahu-14 + 15: dahu-15 + 16: dahu-16 + 17: dahu-17 + 18: dahu-18 + 19: dahu-19 + 20: dahu-20 + 21: dahu-21 + 22: dahu-22 + 23: dahu-23 + 24: dahu-24 + 25: dahu-25 + 26: dahu-26 + 27: dahu-27 + 28: dahu-28 + 29: dahu-29 + 30: dahu-30 + 31: dahu-31 + 32: dahu-32 + 33: yeti-1 + 34: yeti-2 + 35: yeti-3 + 36: yeti-4 + 41: + uid: dighyp1 + kind: other + 42: + uid: dighyp2 + kind: other + 43: + uid: digsed + kind: other + 44: + uid: digsed + kind: other + 45: + uid: digwatt + kind: other + 48: + uid: renater5 + kind: other -- GitLab