From 272f5a903b84796ddcae40d1704b522383886a63 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Wed, 6 Jan 2021 16:58:02 +0100
Subject: [PATCH] [grenoble] Regenerate output
---
.../grenoble/clusters/dahu/nodes/dahu-1.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-10.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-11.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-12.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-13.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-14.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-15.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-16.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-17.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-18.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-19.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-2.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-20.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-21.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-22.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-23.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-24.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-25.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-26.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-27.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-28.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-29.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-3.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-30.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-31.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-32.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-4.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-5.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-6.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-7.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-8.json | 2 +-
.../grenoble/clusters/dahu/nodes/dahu-9.json | 2 +-
.../sites/grenoble/clusters/drac/drac.json | 23 +-
.../grenoble/clusters/drac/nodes/drac-1.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-10.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-11.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-12.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-2.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-3.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-4.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-5.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-6.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-7.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-8.json | 2 +-
.../grenoble/clusters/drac/nodes/drac-9.json | 2 +-
.../clusters/troll/nodes/troll-1.json | 4 +-
.../clusters/troll/nodes/troll-2.json | 4 +-
.../clusters/troll/nodes/troll-3.json | 4 +-
.../clusters/troll/nodes/troll-4.json | 4 +-
.../grenoble/clusters/yeti/nodes/yeti-1.json | 2 +-
.../grenoble/clusters/yeti/nodes/yeti-2.json | 2 +-
.../grenoble/clusters/yeti/nodes/yeti-3.json | 2 +-
.../grenoble/clusters/yeti/nodes/yeti-4.json | 2 +-
.../grenoble/network_equipments/gw-new.json | 258 --------------
.../sites/grenoble/network_equipments/gw.json | 317 ++++++++++++++----
.../network_equipments/sw-aci-333.json | 79 -----
56 files changed, 327 insertions(+), 462 deletions(-)
delete mode 100644 data/grid5000/sites/grenoble/network_equipments/gw-new.json
delete mode 100644 data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
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 6098d19a996..25971f79fc1 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
@@ -85,7 +85,7 @@
"network_address": "dahu-1.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 1",
+ "switch_port": "ethernet1/1/1: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 7aa0f97a1e3..d882e9e85fb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -85,7 +85,7 @@
"network_address": "dahu-10.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 10",
+ "switch_port": "ethernet1/1/10:1",
"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 d3fd9564130..ae17314e5ab 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
@@ -85,7 +85,7 @@
"network_address": "dahu-11.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 11",
+ "switch_port": "ethernet1/1/11:1",
"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 501107a0921..ef2c86558ea 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
@@ -85,7 +85,7 @@
"network_address": "dahu-12.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 12",
+ "switch_port": "ethernet1/1/12:1",
"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 6ff7022fb0e..f3e97bb8179 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
@@ -85,7 +85,7 @@
"network_address": "dahu-13.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 13",
+ "switch_port": "ethernet1/1/13:1",
"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 7b5fa3341b0..a0e152bccde 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
@@ -85,7 +85,7 @@
"network_address": "dahu-14.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 14",
+ "switch_port": "ethernet1/1/14:1",
"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 183ff230018..2da45de04d9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
@@ -85,7 +85,7 @@
"network_address": "dahu-15.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 15",
+ "switch_port": "ethernet1/1/15:1",
"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 ed4581361a1..00368c7d5f4 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
@@ -85,7 +85,7 @@
"network_address": "dahu-16.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 16",
+ "switch_port": "ethernet1/1/16:1",
"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 7342ff79ddf..02c53a5acf5 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -85,7 +85,7 @@
"network_address": "dahu-17.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 17",
+ "switch_port": "ethernet1/1/17:1",
"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 e2efbc2e344..9172bf7c5c0 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -85,7 +85,7 @@
"network_address": "dahu-18.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 18",
+ "switch_port": "ethernet1/1/18:1",
"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 77d3ff9963d..595dab1cdfc 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
@@ -85,7 +85,7 @@
"network_address": "dahu-19.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 19",
+ "switch_port": "ethernet1/1/19:1",
"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 99667435853..62a9409b2e6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
@@ -85,7 +85,7 @@
"network_address": "dahu-2.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 2",
+ "switch_port": "ethernet1/1/2:1",
"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 7ff1a2cd449..c3a4a5410d3 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
@@ -85,7 +85,7 @@
"network_address": "dahu-20.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 20",
+ "switch_port": "ethernet1/1/20:1",
"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 8902de91cd1..bfab53703a9 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
@@ -85,7 +85,7 @@
"network_address": "dahu-21.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 21",
+ "switch_port": "ethernet1/1/21:1",
"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 041d2fde45f..3eb52a6b35e 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
@@ -85,7 +85,7 @@
"network_address": "dahu-22.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 22",
+ "switch_port": "ethernet1/1/22:1",
"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 2bc70864a0e..783293b63ca 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
@@ -85,7 +85,7 @@
"network_address": "dahu-23.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 23",
+ "switch_port": "ethernet1/1/23:1",
"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 68ceabf57ce..1fc868f33df 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
@@ -85,7 +85,7 @@
"network_address": "dahu-24.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 24",
+ "switch_port": "ethernet1/1/24:1",
"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 4684ed3217a..fcd3a06433a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
@@ -85,7 +85,7 @@
"network_address": "dahu-25.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 25",
+ "switch_port": "ethernet1/1/25:1",
"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 e072c65b41c..c74c2a985c8 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
@@ -85,7 +85,7 @@
"network_address": "dahu-26.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 26",
+ "switch_port": "ethernet1/1/26:1",
"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 c97fee461d5..5e83d9c4a56 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
@@ -85,7 +85,7 @@
"network_address": "dahu-27.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 27",
+ "switch_port": "ethernet1/1/27:1",
"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 d798ecf32f8..8f744c1e930 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
@@ -85,7 +85,7 @@
"network_address": "dahu-28.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 28",
+ "switch_port": "ethernet1/1/28:1",
"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 51d971b2951..8e728deccf6 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
@@ -85,7 +85,7 @@
"network_address": "dahu-29.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 29",
+ "switch_port": "ethernet1/1/29:1",
"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 2ae2f82a495..689d98987d7 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
@@ -85,7 +85,7 @@
"network_address": "dahu-3.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 3",
+ "switch_port": "ethernet1/1/3:1",
"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 173313ee807..f4561cbb93a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -85,7 +85,7 @@
"network_address": "dahu-30.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 30",
+ "switch_port": "ethernet1/1/30:1",
"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 c06e893c2f1..b8120a0c724 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
@@ -85,7 +85,7 @@
"network_address": "dahu-31.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 31",
+ "switch_port": "ethernet1/1/31:1",
"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 d27b84d4faa..6ecbf630f61 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
@@ -85,7 +85,7 @@
"network_address": "dahu-32.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 32",
+ "switch_port": "ethernet1/1/32:1",
"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 b7b7ff86d13..e1acd3aae62 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
@@ -85,7 +85,7 @@
"network_address": "dahu-4.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 4",
+ "switch_port": "ethernet1/1/4:1",
"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 a88bd6601d6..1681c77da05 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
@@ -85,7 +85,7 @@
"network_address": "dahu-5.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 5",
+ "switch_port": "ethernet1/1/5:1",
"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 b0f880441dd..499f0a9c31f 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
@@ -85,7 +85,7 @@
"network_address": "dahu-6.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 6",
+ "switch_port": "ethernet1/1/6:1",
"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 c6813d469b8..8920d520f82 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
@@ -85,7 +85,7 @@
"network_address": "dahu-7.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 7",
+ "switch_port": "ethernet1/1/7:1",
"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 d8f9840fb8a..c5d9f7525ba 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
@@ -85,7 +85,7 @@
"network_address": "dahu-8.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 8",
+ "switch_port": "ethernet1/1/8:1",
"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 4a37098c300..d2ad863fe3b 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
@@ -85,7 +85,7 @@
"network_address": "dahu-9.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 9",
+ "switch_port": "ethernet1/1/9:1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
index ba05c3f3546..6d952ecc582 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/drac.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -3,7 +3,28 @@
"exotic": true,
"kavlan": true,
"metrics": [
-
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ }
],
"model": "IBM PowerNV S822LC (8335-GTB)",
"queues": [
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index 3ec43b5d65f..51585825524 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-1.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/37:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index 4927f0903b9..2843dae26a4 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-10.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/46:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index 9d539b9232f..db735fa459e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-11.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/47:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index 2f00f880d3f..0c6c0d0194f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-12.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/48:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index fb930c26d39..54a67265aa6 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-2.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/38:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index 5543cb579a3..77855b93b8a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-3.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/39:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index abddf3d9e6d..eccc3ac5359 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-4.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/40:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index 3af52ca5cf7..e2e68bbb4fe 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-5.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/41:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index 261484e4ce6..658bbb50984 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-6.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/42:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index dca384e83cb..e69230a02c9 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-7.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/43:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 933bc65bc5f..4c5fdbeed11 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-8.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/44:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index 3f4630a7a4c..349194aae9f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -122,7 +122,7 @@
"name": "enP1p1s0f0",
"network_address": "drac-9.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-new",
+ "switch": "gw",
"switch_port": "ethernet1/1/45:1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
index ecd8b0b613a..a715dd4c0c2 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
@@ -85,9 +85,9 @@
"mounted": true,
"name": "eno1",
"network_address": "troll-1.grenoble.grid5000.fr",
- "rate": 10000000000,
+ "rate": 25000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 37",
+ "switch_port": "ethernet1/1/77",
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
index da3051cd8fb..144a5d718f8 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
@@ -85,9 +85,9 @@
"mounted": true,
"name": "eno1",
"network_address": "troll-2.grenoble.grid5000.fr",
- "rate": 10000000000,
+ "rate": 25000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 38",
+ "switch_port": "ethernet1/1/78",
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
index 79f7e7dde4a..e143eb2d759 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
@@ -85,9 +85,9 @@
"mounted": true,
"name": "eno1",
"network_address": "troll-3.grenoble.grid5000.fr",
- "rate": 10000000000,
+ "rate": 25000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 39",
+ "switch_port": "ethernet1/1/79",
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
index 8c5cb543d8f..953623c5930 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
@@ -85,9 +85,9 @@
"mounted": true,
"name": "eno1",
"network_address": "troll-4.grenoble.grid5000.fr",
- "rate": 10000000000,
+ "rate": 25000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 40",
+ "switch_port": "ethernet1/1/80",
"vendor": "Mellanox Technologies"
},
{
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 4627a88ae1e..e9036735f5e 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -85,7 +85,7 @@
"network_address": "yeti-1.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 33",
+ "switch_port": "ethernet1/1/33:1",
"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 e975a591a1e..dbb0b0d9a84 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -85,7 +85,7 @@
"network_address": "yeti-2.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 34",
+ "switch_port": "ethernet1/1/34:1",
"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 9b62ce580e1..cc94be8eac3 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -85,7 +85,7 @@
"network_address": "yeti-3.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 35",
+ "switch_port": "ethernet1/1/35:1",
"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 bdc93204934..6de7723591b 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -85,7 +85,7 @@
"network_address": "yeti-4.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
- "switch_port": "X670V-48x Port 36",
+ "switch_port": "ethernet1/1/36:1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-new.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
deleted file mode 100644
index e9cb2d5ba94..00000000000
--- a/data/grid5000/sites/grenoble/network_equipments/gw-new.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "backplane_bps": 6400000000000,
- "ip": "172.16.31.252",
- "kind": "switch",
- "linecards": [
- {
- "kavlan_pattern": "ethernet1/1/%PORT%:1",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/37:1",
- "uid": "drac-1"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/38:1",
- "uid": "drac-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/39:1",
- "uid": "drac-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/40:1",
- "uid": "drac-4"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/41:1",
- "uid": "drac-5"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/42:1",
- "uid": "drac-6"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/43:1",
- "uid": "drac-7"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/44:1",
- "uid": "drac-8"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/45:1",
- "uid": "drac-9"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/46:1",
- "uid": "drac-10"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/47:1",
- "uid": "drac-11"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "ethernet1/1/48:1",
- "uid": "drac-12"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "switch",
- "snmp_name": "ethernet1/1/91:1",
- "uid": "sw-aci-333"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "ethernet1/1/%PORT%:1"
- }
- ],
- "model": "Dell S5296F-ON",
- "role": "production",
- "serial": "H47D9Z2",
- "site": "grenoble",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "gw-new",
- "warranty": "2027-11-03"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 9eb10eefcd2..99dc40d5b7a 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -3,21 +3,32 @@
"sw-imag",
"gw-grenoble"
],
- "backplane_bps": 800000000000,
+ "backplane_bps": 6400000000000,
"channels": {
- "X670V-48x Port 43": {
- "kind": "switch",
- "port": "TN-G5K-INT",
- "rate": 30000000000,
- "uid": "sw-aci-333"
+ "port-channel10": {
+ "kind": "server",
+ "port": "port-channel10",
+ "rate": 50000000000,
+ "uid": "dignfs"
+ },
+ "port-channel100": {
+ "kind": "other",
+ "port": "port-channel100",
+ "rate": 40000000000,
+ "uid": "ACI-G5K-EXT"
+ },
+ "port-channel20": {
+ "kind": "server",
+ "port": "port-channel20",
+ "rate": 20000000000,
+ "uid": "digsed"
}
},
"ip": "172.16.31.254",
"kind": "router",
"linecards": [
{
- "backplane_bps": 48000000000,
- "kavlan_pattern": "%PORT%",
+ "kavlan_pattern": "ethernet1/1/%PORT%:1",
"kind": "node",
"ports": [
{
@@ -25,286 +36,455 @@
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 1",
+ "snmp_name": "ethernet1/1/1:1",
"uid": "dahu-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 2",
+ "snmp_name": "ethernet1/1/2:1",
"uid": "dahu-2"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 3",
+ "snmp_name": "ethernet1/1/3:1",
"uid": "dahu-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 4",
+ "snmp_name": "ethernet1/1/4:1",
"uid": "dahu-4"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 5",
+ "snmp_name": "ethernet1/1/5:1",
"uid": "dahu-5"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 6",
+ "snmp_name": "ethernet1/1/6:1",
"uid": "dahu-6"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 7",
+ "snmp_name": "ethernet1/1/7:1",
"uid": "dahu-7"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 8",
+ "snmp_name": "ethernet1/1/8:1",
"uid": "dahu-8"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 9",
+ "snmp_name": "ethernet1/1/9:1",
"uid": "dahu-9"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 10",
+ "snmp_name": "ethernet1/1/10:1",
"uid": "dahu-10"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 11",
+ "snmp_name": "ethernet1/1/11:1",
"uid": "dahu-11"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 12",
+ "snmp_name": "ethernet1/1/12:1",
"uid": "dahu-12"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 13",
+ "snmp_name": "ethernet1/1/13:1",
"uid": "dahu-13"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 14",
+ "snmp_name": "ethernet1/1/14:1",
"uid": "dahu-14"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 15",
+ "snmp_name": "ethernet1/1/15:1",
"uid": "dahu-15"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 16",
+ "snmp_name": "ethernet1/1/16:1",
"uid": "dahu-16"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 17",
+ "snmp_name": "ethernet1/1/17:1",
"uid": "dahu-17"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 18",
+ "snmp_name": "ethernet1/1/18:1",
"uid": "dahu-18"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 19",
+ "snmp_name": "ethernet1/1/19:1",
"uid": "dahu-19"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 20",
+ "snmp_name": "ethernet1/1/20:1",
"uid": "dahu-20"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 21",
+ "snmp_name": "ethernet1/1/21:1",
"uid": "dahu-21"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 22",
+ "snmp_name": "ethernet1/1/22:1",
"uid": "dahu-22"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 23",
+ "snmp_name": "ethernet1/1/23:1",
"uid": "dahu-23"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 24",
+ "snmp_name": "ethernet1/1/24:1",
"uid": "dahu-24"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 25",
+ "snmp_name": "ethernet1/1/25:1",
"uid": "dahu-25"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 26",
+ "snmp_name": "ethernet1/1/26:1",
"uid": "dahu-26"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 27",
+ "snmp_name": "ethernet1/1/27:1",
"uid": "dahu-27"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 28",
+ "snmp_name": "ethernet1/1/28:1",
"uid": "dahu-28"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 29",
+ "snmp_name": "ethernet1/1/29:1",
"uid": "dahu-29"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 30",
+ "snmp_name": "ethernet1/1/30:1",
"uid": "dahu-30"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 31",
+ "snmp_name": "ethernet1/1/31:1",
"uid": "dahu-31"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 32",
+ "snmp_name": "ethernet1/1/32:1",
"uid": "dahu-32"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 33",
+ "snmp_name": "ethernet1/1/33:1",
"uid": "yeti-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 34",
+ "snmp_name": "ethernet1/1/34:1",
"uid": "yeti-2"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 35",
+ "snmp_name": "ethernet1/1/35:1",
"uid": "yeti-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 36",
+ "snmp_name": "ethernet1/1/36:1",
"uid": "yeti-4"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 37",
+ "snmp_name": "ethernet1/1/37:1",
+ "uid": "drac-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/38:1",
+ "uid": "drac-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/39:1",
+ "uid": "drac-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/40:1",
+ "uid": "drac-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/41:1",
+ "uid": "drac-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/42:1",
+ "uid": "drac-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/43:1",
+ "uid": "drac-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/44:1",
+ "uid": "drac-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/45:1",
+ "uid": "drac-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/46:1",
+ "uid": "drac-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/47:1",
+ "uid": "drac-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/48:1",
+ "uid": "drac-12"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kavlan_pattern": "ethernet1/1/%PORT%",
+ "kind": "node",
+ "port": "eth0",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/77",
"uid": "troll-1"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 38",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/78",
"uid": "troll-2"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 39",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/79",
"uid": "troll-3"
},
{
+ "kavlan_pattern": "ethernet1/1/%PORT%",
"kind": "node",
"port": "eth0",
- "snmp_name": "X670V-48x Port 40",
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/80",
"uid": "troll-4"
},
{
- "kind": "server",
- "snmp_name": "X670V-48x Port 41",
- "uid": "dighyp1"
},
{
- "kind": "server",
- "snmp_name": "X670V-48x Port 42",
- "uid": "dighyp2"
},
{
"kind": "channel",
- "snmp_name": "X670V-48x Port 43",
- "uid": "X670V-48x Port 43"
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/83:1",
+ "uid": "port-channel10"
},
{
"kind": "channel",
- "snmp_name": "X670V-48x Port 44",
- "uid": "X670V-48x Port 43"
+ "rate": 25000000000,
+ "snmp_name": "ethernet1/1/84:1",
+ "uid": "port-channel10"
},
{
"kind": "channel",
- "snmp_name": "X670V-48x Port 45",
- "uid": "X670V-48x Port 43"
+ "snmp_name": "ethernet1/1/85:1",
+ "uid": "port-channel20"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/86:1",
+ "uid": "port-channel20"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "ethernet1/1/87:1",
+ "uid": "dighyp1"
},
{
"kind": "server",
- "snmp_name": "X670V-48x Port 46",
+ "snmp_name": "ethernet1/1/88:1",
+ "uid": "dighyp2"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "ethernet1/1/89:1",
"uid": "digwatt"
},
+ {
+ },
{
"kind": "other",
- "snmp_name": "X670V-48x Port 47",
- "uid": "ACI-G5K-EXT"
+ "snmp_name": "ethernet1/1/91:1",
+ "uid": "ACI-G5K-INT"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/92:1",
+ "uid": "port-channel100"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/93:1",
+ "uid": "port-channel100"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/94:1",
+ "uid": "port-channel100"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "ethernet1/1/95:1",
+ "uid": "port-channel100"
},
{
"kind": "backbone",
- "snmp_name": "X670V-48x Port 48",
- "uid": "renater5"
+ "snmp_name": "ethernet1/1/96:1",
+ "uid": "renater-grenoble"
}
],
"rate": 10000000000,
- "snmp_pattern": "X670V-48x Port %PORT%"
+ "snmp_pattern": "ethernet1/1/%PORT%:1"
}
],
"metrics": [
@@ -327,8 +507,9 @@
}
}
],
- "model": "ExtremeNetworks",
+ "model": "Dell S5296F-ON",
"role": "production",
+ "serial": "H47D9Z2",
"site": "grenoble",
"snmp_community": "public",
"type": "network_equipment",
@@ -411,5 +592,5 @@
"name": "kavlan-11"
}
},
- "warranty": "expired"
+ "warranty": "2027-11-03"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
deleted file mode 100644
index f11a3e52878..00000000000
--- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "channels": {
- "TN-G5K-INT": {
- "kind": "switch",
- "port": "X670V-48x Port 43",
- "rate": 30000000000,
- "uid": "gw"
- }
- },
- "kind": "switch",
- "linecards": [
- {
- "kind": "switch",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "switch",
- "snmp_name": "5",
- "uid": "gw-new"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "snmp_name": "17",
- "uid": "TN-G5K-INT"
- },
- {
- "kind": "channel",
- "snmp_name": "18",
- "uid": "TN-G5K-INT"
- },
- {
- "kind": "channel",
- "snmp_name": "19",
- "uid": "TN-G5K-INT"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "%PORT%"
- }
- ],
- "model": "Cisco ACI leaf",
- "role": "production",
- "site": "grenoble",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "sw-aci-333",
- "warranty": "N/A"
-}
\ No newline at end of file
--
GitLab