From a48351a5455d942aad3bc0c0adc956ee78d071cd Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Tue, 1 Apr 2025 10:40:30 +0200
Subject: [PATCH] [network][nancy] gateway switch
---
.../clusters/graffiti/nodes/graffiti-1.json | 2 +-
.../clusters/graffiti/nodes/graffiti-10.json | 2 +-
.../clusters/graffiti/nodes/graffiti-11.json | 2 +-
.../clusters/graffiti/nodes/graffiti-12.json | 2 +-
.../clusters/graffiti/nodes/graffiti-13.json | 2 +-
.../clusters/graffiti/nodes/graffiti-2.json | 2 +-
.../clusters/graffiti/nodes/graffiti-3.json | 2 +-
.../clusters/graffiti/nodes/graffiti-4.json | 2 +-
.../clusters/graffiti/nodes/graffiti-5.json | 2 +-
.../clusters/graffiti/nodes/graffiti-6.json | 2 +-
.../clusters/graffiti/nodes/graffiti-7.json | 2 +-
.../clusters/graffiti/nodes/graffiti-8.json | 2 +-
.../clusters/graffiti/nodes/graffiti-9.json | 2 +-
.../gratouille/nodes/gratouille-1.json | 2 +-
.../nancy/clusters/grele/nodes/grele-1.json | 2 +-
.../nancy/clusters/grele/nodes/grele-10.json | 2 +-
.../nancy/clusters/grele/nodes/grele-11.json | 2 +-
.../nancy/clusters/grele/nodes/grele-12.json | 2 +-
.../nancy/clusters/grele/nodes/grele-13.json | 2 +-
.../nancy/clusters/grele/nodes/grele-2.json | 2 +-
.../nancy/clusters/grele/nodes/grele-3.json | 2 +-
.../nancy/clusters/grele/nodes/grele-4.json | 2 +-
.../nancy/clusters/grele/nodes/grele-5.json | 2 +-
.../nancy/clusters/grele/nodes/grele-6.json | 2 +-
.../nancy/clusters/grele/nodes/grele-7.json | 2 +-
.../nancy/clusters/grele/nodes/grele-8.json | 2 +-
.../nancy/clusters/grele/nodes/grele-9.json | 2 +-
.../clusters/grostiti/nodes/grostiti-1.json | 2 +-
.../nancy/clusters/grue/nodes/grue-1.json | 2 +-
.../nancy/clusters/grue/nodes/grue-2.json | 2 +-
.../nancy/clusters/grue/nodes/grue-3.json | 2 +-
.../nancy/clusters/grue/nodes/grue-4.json | 2 +-
.../nancy/clusters/grue/nodes/grue-5.json | 2 +-
.../nancy/network_equipments/gw-next.json | 309 ---------
.../sites/nancy/network_equipments/gw.json | 503 +++-----------
.../nancy/network_equipments/sgrappe.json | 4 +-
.../nancy/network_equipments/sgravillon2.json | 615 ++++++++++++++++++
.../nancy/network_equipments/sgrdix.json | 4 +-
.../nancy/network_equipments/sgros1.json | 8 +-
.../nancy/network_equipments/sgros2.json | 4 +-
.../nancy/network_equipments/sgruss.json | 4 +-
.../nancy/network_equipments/sgrvingt.json | 4 +-
.../sites/nancy/networks/gw-nancy.yaml | 219 +++----
.../sites/nancy/networks/gw-next.yaml | 128 ----
.../sites/nancy/networks/sgrappe.yaml | 4 +-
.../sites/nancy/networks/sgravillon2.yaml | 199 ++++++
.../grid5000/sites/nancy/networks/sgrdix.yaml | 4 +-
.../grid5000/sites/nancy/networks/sgros1.yaml | 6 +-
.../grid5000/sites/nancy/networks/sgros2.yaml | 4 +-
.../grid5000/sites/nancy/networks/sgruss.yaml | 4 +-
.../sites/nancy/networks/sgrvingt.yaml | 4 +-
51 files changed, 1043 insertions(+), 1050 deletions(-)
delete mode 100644 data/grid5000/sites/nancy/network_equipments/gw-next.json
create mode 100644 data/grid5000/sites/nancy/network_equipments/sgravillon2.json
delete mode 100644 input/grid5000/sites/nancy/networks/gw-next.yaml
create mode 100644 input/grid5000/sites/nancy/networks/sgravillon2.yaml
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index deb836d839e..99624831681 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/18",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 7d95c7c72e3..09f5d666351 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/27",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index 7b0f4b821dc..88e68120f23 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/28",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 160d9c5fa58..f5da67a48ab 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index f3f1af5eb5a..14eae14c54f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/30",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index c91b52a2bd7..1e69fb48f3e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index 44dc440dccc..d1239325559 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 975cf7885f3..bbbb6c5a1c2 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/21",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 7399507fae4..3ec5faca3b8 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/22",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index a47c56e2043..eaf4bbae909 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 99a03a847f4..a0c4a9d0778 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/24",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index 04b245ce7d6..a953b3feb8f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/25",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 1df08f2849a..214b632acac 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -242,7 +242,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/26",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json b/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
index 75fbc15ea94..0ea7cb6d08a 100644
--- a/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
@@ -154,7 +154,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
index 1c9e4e68690..ffd76297c52 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
index 7ad472e0e33..b0af98beea8 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/10",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
index db9f5f96d84..a5333c9fa9b 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
index 71e1b21bd4e..df9123ea1d9 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/12",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
index 7acb5ca5882..8d346c45ef5 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
index 1f7b353a9c5..3959e923a6c 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/2",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
index 81c3fe744ea..a65ba6d0b8d 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
index 2973c7a1ae8..9cb7cc9b487 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/4",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
index d2c3a407007..70173e00ce5 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
index 99a078ea0dc..d5430a0cd84 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/6",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
index 41a8fb29d57..576b2cabc64 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
index b74da2ab8f8..57ff2eb1715 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
index 736dc0cd728..9550bf09539 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
@@ -171,7 +171,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "sgravillon2",
"switch_port": "Ethernet7/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grostiti/nodes/grostiti-1.json b/data/grid5000/sites/nancy/clusters/grostiti/nodes/grostiti-1.json
index 7a767d662c8..2447b4e2057 100644
--- a/data/grid5000/sites/nancy/clusters/grostiti/nodes/grostiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/grostiti/nodes/grostiti-1.json
@@ -335,7 +335,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/31",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 111aa97ea6f..bd79d1f32e7 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -249,7 +249,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index 08560458546..c1b56755067 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -249,7 +249,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 8eb89c080f4..29d0ea0248e 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -249,7 +249,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index b87bd520e5d..fea68084da1 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -249,7 +249,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/16",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index 19e22b14a00..4d9ab7038ab 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -249,7 +249,7 @@
"rate": 10000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "gw-next",
+ "switch": "gw",
"switch_port": "1/1/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
deleted file mode 100644
index 8509f5dbf1b..00000000000
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ /dev/null
@@ -1,309 +0,0 @@
-{
- "alias": [
- {
- "ip": "172.17.79.252",
- "name": "gw-next-adm"
- }
- ],
- "backplane_bps": 1440000000000,
- "ip": "172.17.79.251",
- "kind": "switch",
- "linecards": [
- {
- },
- {
- "kavlan_pattern": "%LINECARD%/1/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/13",
- "uid": "grue-1"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/14",
- "uid": "grue-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/15",
- "uid": "grue-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/16",
- "uid": "grue-4"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/17",
- "uid": "grue-5"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/18",
- "uid": "graffiti-1"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/19",
- "uid": "graffiti-2"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/20",
- "uid": "graffiti-3"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/21",
- "uid": "graffiti-4"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/22",
- "uid": "graffiti-5"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/23",
- "uid": "graffiti-6"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/24",
- "uid": "graffiti-7"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/25",
- "uid": "graffiti-8"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/26",
- "uid": "graffiti-9"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/27",
- "uid": "graffiti-10"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/28",
- "uid": "graffiti-11"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/29",
- "uid": "graffiti-12"
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "1/1/30",
- "uid": "graffiti-13"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/31",
- "uid": "grostiti-1"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "switch",
- "rate": 40000000000,
- "snmp_name": "1/1/49",
- "uid": "sgros1"
- },
- {
- "kind": "switch",
- "rate": 40000000000,
- "snmp_name": "1/1/50",
- "uid": "sgruss"
- },
- {
- "kind": "switch",
- "rate": 40000000000,
- "snmp_name": "1/1/51",
- "uid": "sgrappe"
- },
- {
- "kind": "switch",
- "rate": 40000000000,
- "snmp_name": "1/1/52",
- "uid": "sgrdix"
- },
- {
- "kind": "switch",
- "rate": 40000000000,
- "snmp_name": "1/1/53",
- "uid": "sgrvingt"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "%LINECARD%/1/%PORT%"
- }
- ],
- "managed_by_us": true,
- "metrics": [
- {
- "description": "Input byte counter for the network device port",
- "name": "network_ifacein_bytes_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Output byte counter for the network device port",
- "name": "network_ifaceout_bytes_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Input packet counter for the network device port",
- "name": "network_ifacein_packets_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Output packet counter for the network device port",
- "name": "network_ifaceout_packets_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Input counter of discarded packets for the network device port",
- "name": "network_ifacein_packets_discard_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Output counter of discarded packets for the network device port",
- "name": "network_ifaceout_packets_discard_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Input counter of packet errors for the network device port",
- "name": "network_ifacein_packets_error_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- },
- {
- "description": "Output counter of packet errors for the network device port",
- "name": "network_ifaceout_packets_error_total",
- "period": 5000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
- "protocol": "snmp"
- }
- }
- ],
- "model": "Aruba 8325-48Y8C JL635A",
- "serial": "TW32KM007R",
- "site": "nancy",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "gw-next",
- "warranty": "2048-08-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index bd2fd5b74b1..1707edc13ec 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -1,17 +1,12 @@
{
"alias": [
"gw-nancy",
- "sgravillon2"
- ],
- "backplane_bps": 1280000000000,
- "channels": {
- "port-channel3": {
- "kind": "switch",
- "port": "port-channel1",
- "rate": 80000000000,
- "uid": "sgros2"
+ {
+ "ip": "172.17.79.254",
+ "name": "gw-adm"
}
- },
+ ],
+ "backplane_bps": 1440000000000,
"ip": "172.16.79.254",
"ip6": "2001:660:4406:500::ffff:ffff",
"kind": "router",
@@ -19,10 +14,8 @@
{
},
{
- "backplane_bps": 1280000000000,
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
"kind": "node",
- "model": "N9K-X9464PX",
"ports": [
{
},
@@ -30,142 +23,10 @@
},
{
},
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet1/38",
- "uid": "pve-99"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "other",
- "snmp_name": "Ethernet1/47",
- "uid": "LORIA"
- },
{
"kind": "backbone",
- "snmp_name": "Ethernet1/48",
+ "snmp_name": "1/1/3",
"uid": "renater-nancy"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "backplane_bps": 1280000000000,
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
- "model": "N9K-X9464PX",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
},
{
},
@@ -183,214 +44,121 @@
},
{
},
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet6/51",
- "uid": "port-channel3"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet6/52",
- "uid": "port-channel3"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
- },
- {
- "backplane_bps": 1280000000000,
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
- "model": "N9K-X9464PX",
- "ports": [
{
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet7/1",
- "uid": "grele-1"
+ "snmp_name": "1/1/13",
+ "uid": "grue-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet7/2",
- "uid": "grele-2"
+ "snmp_name": "1/1/14",
+ "uid": "grue-2"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet7/3",
- "uid": "grele-3"
+ "snmp_name": "1/1/15",
+ "uid": "grue-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet7/4",
- "uid": "grele-4"
+ "snmp_name": "1/1/16",
+ "uid": "grue-4"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet7/5",
- "uid": "grele-5"
+ "snmp_name": "1/1/17",
+ "uid": "grue-5"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/6",
- "uid": "grele-6"
+ "port": "eth2",
+ "snmp_name": "1/1/18",
+ "uid": "graffiti-1"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/7",
- "uid": "grele-7"
+ "port": "eth2",
+ "snmp_name": "1/1/19",
+ "uid": "graffiti-2"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/8",
- "uid": "grele-8"
+ "port": "eth2",
+ "snmp_name": "1/1/20",
+ "uid": "graffiti-3"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/9",
- "uid": "grele-9"
+ "port": "eth2",
+ "snmp_name": "1/1/21",
+ "uid": "graffiti-4"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/10",
- "uid": "grele-10"
+ "port": "eth2",
+ "snmp_name": "1/1/22",
+ "uid": "graffiti-5"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/11",
- "uid": "grele-11"
+ "port": "eth2",
+ "snmp_name": "1/1/23",
+ "uid": "graffiti-6"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/12",
- "uid": "grele-12"
+ "port": "eth2",
+ "snmp_name": "1/1/24",
+ "uid": "graffiti-7"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/13",
- "uid": "grele-13"
+ "port": "eth2",
+ "snmp_name": "1/1/25",
+ "uid": "graffiti-8"
},
{
"kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7/14",
- "uid": "gratouille-1"
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet7/15",
- "uid": "talc-data"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
+ "port": "eth2",
+ "snmp_name": "1/1/26",
+ "uid": "graffiti-9"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/27",
+ "uid": "graffiti-10"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/28",
+ "uid": "graffiti-11"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/29",
+ "uid": "graffiti-12"
},
{
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "1/1/30",
+ "uid": "graffiti-13"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/31",
+ "uid": "grostiti-1"
},
{
},
@@ -427,22 +195,38 @@
{
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/49",
+ "uid": "sgros1"
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/50",
+ "uid": "sgruss"
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/51",
+ "uid": "sgrappe"
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/52",
+ "uid": "sgrdix"
},
{
"kind": "switch",
"rate": 40000000000,
- "snmp_name": "Ethernet7/51",
- "uid": "sgros1"
+ "snmp_name": "1/1/53",
+ "uid": "sgrvingt"
}
],
"rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
}
],
"managed_by_us": true,
@@ -450,25 +234,25 @@
{
"description": "Input byte counter for the network device port",
"name": "network_ifacein_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
- "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
}
},
{
"description": "Output byte counter for the network device port",
"name": "network_ifaceout_bytes_total",
- "period": 10000,
+ "period": 5000,
"source": {
- "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
}
},
{
"description": "Input packet counter for the network device port",
"name": "network_ifacein_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -477,7 +261,7 @@
{
"description": "Output packet counter for the network device port",
"name": "network_ifaceout_packets_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -486,7 +270,7 @@
{
"description": "Input counter of discarded packets for the network device port",
"name": "network_ifacein_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -495,7 +279,7 @@
{
"description": "Output counter of discarded packets for the network device port",
"name": "network_ifaceout_packets_discard_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -504,7 +288,7 @@
{
"description": "Input counter of packet errors for the network device port",
"name": "network_ifacein_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
@@ -513,113 +297,18 @@
{
"description": "Output counter of packet errors for the network device port",
"name": "network_ifaceout_packets_error_total",
- "period": 10000,
+ "period": 5000,
"source": {
"id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
"protocol": "snmp"
}
}
],
- "model": "Cisco Nexus 9508",
- "pdu": [
- {
- "port": 8,
- "uid": "graoully-pdu1"
- },
- {
- "port": 8,
- "uid": "graoully-pdu2"
- },
- {
- "port": 8,
- "uid": "grimoire-pdu1"
- },
- {
- "port": 8,
- "uid": "grimoire-pdu2"
- }
- ],
+ "model": "Aruba 8325-48Y8C JL635A",
+ "serial": "TW32KM007R",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "gw",
- "vlans": {
- "vlan100": {
- "addresses": [
- "172.16.79.254"
- ],
- "administrative": true
- },
- "vlan101": {
- "addresses": [
- "172.17.79.254"
- ]
- },
- "vlan500": {
- "addresses": [
- "192.168.4.14"
- ]
- },
- "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.16.0.0/18"
- ],
- "name": "kavlan-4"
- },
- "vlan705": {
- "addresses": [
- "10.16.64.0/18"
- ],
- "name": "kavlan-5"
- },
- "vlan706": {
- "addresses": [
- "10.16.128.0/18"
- ],
- "name": "kavlan-6"
- },
- "vlan707": {
- "addresses": [
- "10.16.192.0/18"
- ],
- "name": "kavlan-7"
- },
- "vlan708": {
- "addresses": [
- "10.17.0.0/18"
- ],
- "name": "kavlan-8"
- },
- "vlan709": {
- "addresses": [
- "10.17.64.0/18"
- ],
- "name": "kavlan-9"
- },
- "vlan714": {
- "addresses": [
- "10.19.192.0/18"
- ],
- "name": "kavlan-14"
- }
- },
- "warranty": "2020-09-01"
+ "warranty": "2048-08-18"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 418666ec258..5699b345663 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -124,10 +124,10 @@
{
},
{
- "kind": "switch",
+ "kind": "router",
"rate": 40000000000,
"snmp_name": "ethernet1/1/25:1",
- "uid": "gw-next"
+ "uid": "gw"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon2.json b/data/grid5000/sites/nancy/network_equipments/sgravillon2.json
new file mode 100644
index 00000000000..c5600e9d363
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon2.json
@@ -0,0 +1,615 @@
+{
+ "backplane_bps": 1280000000000,
+ "channels": {
+ "port-channel3": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 80000000000,
+ "uid": "sgros2"
+ }
+ },
+ "ip": "172.16.79.250",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "backplane_bps": 1280000000000,
+ "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
+ "model": "N9K-X9464PX",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "server",
+ "snmp_name": "Ethernet1/38",
+ "uid": "pve-99"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "Ethernet1/47",
+ "uid": "LORIA"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "backplane_bps": 1280000000000,
+ "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
+ "model": "N9K-X9464PX",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet6/51",
+ "uid": "port-channel3"
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet6/52",
+ "uid": "port-channel3"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ },
+ {
+ "backplane_bps": 1280000000000,
+ "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
+ "model": "N9K-X9464PX",
+ "ports": [
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/1",
+ "uid": "grele-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/2",
+ "uid": "grele-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/3",
+ "uid": "grele-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/4",
+ "uid": "grele-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/5",
+ "uid": "grele-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/6",
+ "uid": "grele-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/7",
+ "uid": "grele-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/8",
+ "uid": "grele-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/9",
+ "uid": "grele-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/10",
+ "uid": "grele-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/11",
+ "uid": "grele-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/12",
+ "uid": "grele-12"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/13",
+ "uid": "grele-13"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/14",
+ "uid": "gratouille-1"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "Ethernet7/15",
+ "uid": "talc-data"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet7/51",
+ "uid": "sgros1"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "metrics": [
+ {
+ "description": "Input byte counter for the network device port",
+ "name": "network_ifacein_bytes_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "name": "network_ifaceout_bytes_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "name": "network_ifacein_packets_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "name": "network_ifaceout_packets_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "name": "network_ifacein_packets_discard_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "name": "network_ifacein_packets_error_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "name": "network_ifaceout_packets_error_total",
+ "period": 10000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ }
+ ],
+ "model": "Cisco Nexus 9508",
+ "pdu": [
+ {
+ "port": 8,
+ "uid": "graoully-pdu1"
+ },
+ {
+ "port": 8,
+ "uid": "graoully-pdu2"
+ },
+ {
+ "port": 8,
+ "uid": "grimoire-pdu1"
+ },
+ {
+ "port": 8,
+ "uid": "grimoire-pdu2"
+ }
+ ],
+ "site": "nancy",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sgravillon2",
+ "vlans": {
+ "vlan100": {
+ "addresses": [
+ "172.16.79.254"
+ ],
+ "administrative": true
+ },
+ "vlan101": {
+ "addresses": [
+ "172.17.79.254"
+ ]
+ },
+ "vlan500": {
+ "addresses": [
+ "192.168.4.14"
+ ]
+ },
+ "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.16.0.0/18"
+ ],
+ "name": "kavlan-4"
+ },
+ "vlan705": {
+ "addresses": [
+ "10.16.64.0/18"
+ ],
+ "name": "kavlan-5"
+ },
+ "vlan706": {
+ "addresses": [
+ "10.16.128.0/18"
+ ],
+ "name": "kavlan-6"
+ },
+ "vlan707": {
+ "addresses": [
+ "10.16.192.0/18"
+ ],
+ "name": "kavlan-7"
+ },
+ "vlan708": {
+ "addresses": [
+ "10.17.0.0/18"
+ ],
+ "name": "kavlan-8"
+ },
+ "vlan709": {
+ "addresses": [
+ "10.17.64.0/18"
+ ],
+ "name": "kavlan-9"
+ },
+ "vlan714": {
+ "addresses": [
+ "10.19.192.0/18"
+ ],
+ "name": "kavlan-14"
+ }
+ },
+ "warranty": "2020-09-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrdix.json b/data/grid5000/sites/nancy/network_equipments/sgrdix.json
index c144ca03d07..6c8abba77c6 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrdix.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrdix.json
@@ -200,10 +200,10 @@
{
},
{
- "kind": "switch",
+ "kind": "router",
"rate": 40000000000,
"snmp_name": "1/1/49",
- "uid": "gw-next"
+ "uid": "gw"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index bacd6f3db7e..0b7a9625974 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -11,14 +11,14 @@
{
},
{
- "kind": "switch",
+ "kind": "router",
"snmp_name": "ethernet1/1/1:1",
- "uid": "gw-next"
+ "uid": "gw"
},
{
- "kind": "router",
+ "kind": "switch",
"snmp_name": "ethernet1/1/2:1",
- "uid": "gw"
+ "uid": "sgravillon2"
}
],
"rate": 40000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 09713fce1a5..6a9329cc62d 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -2,10 +2,10 @@
"backplane_bps": 12800000000000,
"channels": {
"port-channel1": {
- "kind": "router",
+ "kind": "switch",
"port": "port-channel3",
"rate": 80000000000,
- "uid": "gw"
+ "uid": "sgravillon2"
}
},
"ip": "172.17.79.209",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index 58ada8051e9..b21cab4893d 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -92,10 +92,10 @@
{
},
{
- "kind": "switch",
+ "kind": "router",
"rate": 40000000000,
"snmp_name": "ethernet1/1/25:1",
- "uid": "gw-next"
+ "uid": "gw"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 8803878fd5c..d5e04b4eebf 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -293,10 +293,10 @@
{
},
{
- "kind": "switch",
+ "kind": "router",
"rate": 40000000000,
"snmp_name": "fortyGigE 1/54",
- "uid": "gw-next"
+ "uid": "gw"
}
],
"rate": 10000000000,
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 108233390a7..2ad4dadd3a6 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -1,206 +1,133 @@
---
gw:
- model: Cisco Nexus 9508
- warranty: 2020-09-01
+ model: Aruba 8325-48Y8C JL635A
+ warranty: 2048-08-18
+ serial: TW32KM007R
kind: router
managed_by_us: true
site: nancy
- snmp_community: public
ip: 172.16.79.254
ip6: 2001:660:4406:500::ffff:ffff
alias:
- gw-nancy
- - sgravillon2
- pdu:
- - uid: graoully-pdu1
- port: 8
- - uid: graoully-pdu2
- port: 8
- - uid: grimoire-pdu1
- port: 8
- - uid: grimoire-pdu2
- port: 8
+ - name: gw-adm # interface de management
+ ip: 172.17.79.254
+ snmp_community: public
metrics:
- name: network_ifacein_bytes_total
description: Input byte counter for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
- id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_bytes_total
description: Output byte counter for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
- id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_total
description: Input packet counter for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_total
description: Output packet counter for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_discard_total
description: Input counter of discarded packets for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_discard_total
description: Output counter of discarded packets for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifacein_packets_error_total
description: Input counter of packet errors for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- name: network_ifaceout_packets_error_total
description: Output counter of packet errors for the network device port
- period: 10000
+ period: 5000
source:
protocol: snmp
id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- vlans:
- "vlan100":
- administrative: yes
- addresses:
- - 172.16.79.254
- "vlan101":
- addresses:
- - 172.17.79.254
- "vlan500":
- addresses:
- - 192.168.4.14
- "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.16.0.0/18
- "vlan705":
- name: kavlan-5
- addresses:
- - 10.16.64.0/18
- "vlan706":
- name: kavlan-6
- addresses:
- - 10.16.128.0/18
- "vlan707":
- name: kavlan-7
- addresses:
- - 10.16.192.0/18
- "vlan708":
- name: kavlan-8
- addresses:
- - 10.17.0.0/18
- "vlan709":
- name: kavlan-9
- addresses:
- - 10.17.64.0/18
- "vlan714":
- name: kavlan-14
- addresses:
- - 10.19.192.0/18
- backplane_bps: 1280000000000
+ backplane_bps: 1440000000000
linecards:
1:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
- backplane_bps: 1280000000000
- model: N9K-X9464PX
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 10_000_000_000
kind: node
- rate: 10000000000
ports:
- 38:
- uid: pve-99
- kind: server
- 47:
- uid: LORIA
- kind: other
- 48:
+ 3:
uid: renater-nancy
kind: backbone
- 6:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
- backplane_bps: 1280000000000
- model: N9K-X9464PX
- kind: node
- rate: 10000000000
- ports:
- 51:
- uid: port-channel3
- kind: channel
- rate: 40_000_000_000
- 52:
- uid: port-channel3
- kind: channel
- rate: 40_000_000_000
- 7:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
- backplane_bps: 1280000000000
- model: N9K-X9464PX
- kind: node
- rate: 10000000000
- ports:
- 1:
- uid: grele-1
- 2:
- uid: grele-2
- 3:
- uid: grele-3
- 4:
- uid: grele-4
- 5:
- uid: grele-5
- 6:
- uid: grele-6
- 7:
- uid: grele-7
- 8:
- uid: grele-8
- 9:
- uid: grele-9
- 10:
- uid: grele-10
- 11:
- uid: grele-11
- 12:
- uid: grele-12
13:
- uid: grele-13
+ uid: grue-1
14:
- uid: gratouille-1
+ uid: grue-2
15:
- uid: talc-data
- kind: server
- 51:
+ uid: grue-3
+ 16:
+ uid: grue-4
+ 17:
+ uid: grue-5
+ 18:
+ uid: graffiti-1-eth2
+ 19:
+ uid: graffiti-2-eth2
+ 20:
+ uid: graffiti-3-eth2
+ 21:
+ uid: graffiti-4-eth2
+ 22:
+ uid: graffiti-5-eth2
+ 23:
+ uid: graffiti-6-eth2
+ 24:
+ uid: graffiti-7-eth2
+ 25:
+ uid: graffiti-8-eth2
+ 26:
+ uid: graffiti-9-eth2
+ 27:
+ uid: graffiti-10-eth2
+ 28:
+ uid: graffiti-11-eth2
+ 29:
+ uid: graffiti-12-eth2
+ 30:
+ uid: graffiti-13-eth2
+ 31:
+ uid: grostiti-1
+ 49:
uid: sgros1
kind: switch
rate: 40_000_000_000
- channels:
- port-channel3:
- port: port-channel1
- uid: sgros2
- kind: switch
- rate: 80_000_000_000
+ 50:
+ uid: sgruss
+ kind: switch
+ rate: 40_000_000_000
+ 51:
+ uid: sgrappe
+ kind: switch
+ rate: 40_000_000_000
+ 52:
+ uid: sgrdix
+ kind: switch
+ rate: 40_000_000_000
+ 53:
+ uid: sgrvingt
+ kind: switch
+ rate: 40_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
deleted file mode 100644
index 50817750c33..00000000000
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
----
-gw-next:
- model: Aruba 8325-48Y8C JL635A
- warranty: 2048-08-18
- serial: TW32KM007R
- kind: switch
- managed_by_us: true
- site: nancy
- ip: 172.17.79.251 # interface sur le vlan101
- alias:
- - name: gw-next-adm # interface de management
- ip: 172.17.79.252
- snmp_community: public
- metrics:
- - name: network_ifacein_bytes_total
- description: Input byte counter for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifaceout_bytes_total
- description: Output byte counter for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifacein_packets_total
- description: Input packet counter for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifaceout_packets_total
- description: Output packet counter for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifacein_packets_discard_total
- description: Input counter of discarded packets for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifaceout_packets_discard_total
- description: Output counter of discarded packets for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifacein_packets_error_total
- description: Input counter of packet errors for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- - name: network_ifaceout_packets_error_total
- description: Output counter of packet errors for the network device port
- period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
- backplane_bps: 1440000000000
- linecards:
- 1:
- snmp_pattern: "%LINECARD%/1/%PORT%"
- kavlan_pattern: "%LINECARD%/1/%PORT%"
- rate: 10_000_000_000
- kind: node
- ports:
- 13:
- uid: grue-1
- 14:
- uid: grue-2
- 15:
- uid: grue-3
- 16:
- uid: grue-4
- 17:
- uid: grue-5
- 18:
- uid: graffiti-1-eth2
- 19:
- uid: graffiti-2-eth2
- 20:
- uid: graffiti-3-eth2
- 21:
- uid: graffiti-4-eth2
- 22:
- uid: graffiti-5-eth2
- 23:
- uid: graffiti-6-eth2
- 24:
- uid: graffiti-7-eth2
- 25:
- uid: graffiti-8-eth2
- 26:
- uid: graffiti-9-eth2
- 27:
- uid: graffiti-10-eth2
- 28:
- uid: graffiti-11-eth2
- 29:
- uid: graffiti-12-eth2
- 30:
- uid: graffiti-13-eth2
- 31:
- uid: grostiti-1
- 49:
- uid: sgros1
- kind: switch
- rate: 40_000_000_000
- 50:
- uid: sgruss
- kind: switch
- rate: 40_000_000_000
- 51:
- uid: sgrappe
- kind: switch
- rate: 40_000_000_000
- 52:
- uid: sgrdix
- kind: switch
- rate: 40_000_000_000
- 53:
- uid: sgrvingt
- kind: switch
- rate: 40_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 5a7949a96c1..b4eccd13b1a 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -99,6 +99,6 @@ sgrappe:
uid: grappe-16
25:
snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- uid: gw-next
+ uid: gw
rate: 40_000_000_000
- kind: switch
+ kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgravillon2.yaml b/input/grid5000/sites/nancy/networks/sgravillon2.yaml
new file mode 100644
index 00000000000..b25cbf66af0
--- /dev/null
+++ b/input/grid5000/sites/nancy/networks/sgravillon2.yaml
@@ -0,0 +1,199 @@
+---
+sgravillon2:
+ model: Cisco Nexus 9508
+ warranty: 2020-09-01
+ kind: switch
+ managed_by_us: true
+ site: nancy
+ snmp_community: public
+ ip: 172.16.79.250
+ pdu:
+ - uid: graoully-pdu1
+ port: 8
+ - uid: graoully-pdu2
+ port: 8
+ - uid: grimoire-pdu1
+ port: 8
+ - uid: grimoire-pdu2
+ port: 8
+ metrics:
+ - name: network_ifacein_bytes_total
+ description: Input byte counter for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_bytes_total
+ description: Output byte counter for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_total
+ description: Input packet counter for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_total
+ description: Output packet counter for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_discard_total
+ description: Input counter of discarded packets for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_discard_total
+ description: Output counter of discarded packets for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_error_total
+ description: Input counter of packet errors for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_error_total
+ description: Output counter of packet errors for the network device port
+ period: 10000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ vlans:
+ "vlan100":
+ administrative: yes
+ addresses:
+ - 172.16.79.254
+ "vlan101":
+ addresses:
+ - 172.17.79.254
+ "vlan500":
+ addresses:
+ - 192.168.4.14
+ "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.16.0.0/18
+ "vlan705":
+ name: kavlan-5
+ addresses:
+ - 10.16.64.0/18
+ "vlan706":
+ name: kavlan-6
+ addresses:
+ - 10.16.128.0/18
+ "vlan707":
+ name: kavlan-7
+ addresses:
+ - 10.16.192.0/18
+ "vlan708":
+ name: kavlan-8
+ addresses:
+ - 10.17.0.0/18
+ "vlan709":
+ name: kavlan-9
+ addresses:
+ - 10.17.64.0/18
+ "vlan714":
+ name: kavlan-14
+ addresses:
+ - 10.19.192.0/18
+ backplane_bps: 1280000000000
+ linecards:
+ 1:
+ snmp_pattern: "Ethernet%LINECARD%/%PORT%"
+ kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+ backplane_bps: 1280000000000
+ model: N9K-X9464PX
+ kind: node
+ rate: 10000000000
+ ports:
+ 38:
+ uid: pve-99
+ kind: server
+ 47:
+ uid: LORIA
+ kind: other
+ 6:
+ snmp_pattern: "Ethernet%LINECARD%/%PORT%"
+ kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+ backplane_bps: 1280000000000
+ model: N9K-X9464PX
+ kind: node
+ rate: 10000000000
+ ports:
+ 51:
+ uid: port-channel3
+ kind: channel
+ rate: 40_000_000_000
+ 52:
+ uid: port-channel3
+ kind: channel
+ rate: 40_000_000_000
+ 7:
+ snmp_pattern: "Ethernet%LINECARD%/%PORT%"
+ kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+ backplane_bps: 1280000000000
+ model: N9K-X9464PX
+ kind: node
+ rate: 10000000000
+ ports:
+ 1:
+ uid: grele-1
+ 2:
+ uid: grele-2
+ 3:
+ uid: grele-3
+ 4:
+ uid: grele-4
+ 5:
+ uid: grele-5
+ 6:
+ uid: grele-6
+ 7:
+ uid: grele-7
+ 8:
+ uid: grele-8
+ 9:
+ uid: grele-9
+ 10:
+ uid: grele-10
+ 11:
+ uid: grele-11
+ 12:
+ uid: grele-12
+ 13:
+ uid: grele-13
+ 14:
+ uid: gratouille-1
+ 15:
+ uid: talc-data
+ kind: server
+ 51:
+ uid: sgros1
+ kind: switch
+ rate: 40_000_000_000
+ channels:
+ port-channel3:
+ port: port-channel1
+ uid: sgros2
+ kind: switch
+ rate: 80_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/sgrdix.yaml b/input/grid5000/sites/nancy/networks/sgrdix.yaml
index 74b623cedf2..383c604973d 100644
--- a/input/grid5000/sites/nancy/networks/sgrdix.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrdix.yaml
@@ -112,6 +112,6 @@ sgrdix:
26:
uid: grdix-16-eth0
49:
- uid: gw-next
+ uid: gw
rate: 40_000_000_000
- kind: switch
+ kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index c9e7e066972..f23fcceb5f6 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -65,11 +65,11 @@ sgros1:
rate: 40_000_000_000
ports:
1:
- uid: gw-next
- kind: switch
- 2:
uid: gw
kind: router
+ 2:
+ uid: sgravillon2
+ kind: switch
3:
snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index ade171b7964..45c1ac8557a 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -383,6 +383,6 @@ sgros2:
channels:
port-channel1:
port: port-channel3
- uid: gw
- kind: router
+ uid: sgravillon2
+ kind: switch
rate: 80000000000
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index 52864c2c857..20284cc5810 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -83,6 +83,6 @@ sgruss:
uid: grouille-1-eth2
25:
snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- uid: gw-next
+ uid: gw
rate: 40_000_000_000
- kind: switch
+ kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index c34ffa91db7..3038efd3892 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -112,10 +112,10 @@ sgrvingt:
45: grvingt-45
46: grvingt-46
54:
- uid: gw-next
+ uid: gw
snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
rate: 40_000_000_000
- kind: switch
+ kind: router
49:
snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
--
GitLab