From efb6ff996eff78e09faff3bf6ef8a3c793da307f Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Thu, 17 Aug 2023 10:07:56 +0200
Subject: [PATCH] [rennes] Switch to new gateway as main router
---
.../clusters/parasilo/nodes/parasilo-1.json | 4 +-
.../clusters/parasilo/nodes/parasilo-10.json | 4 +-
.../clusters/parasilo/nodes/parasilo-11.json | 4 +-
.../clusters/parasilo/nodes/parasilo-12.json | 4 +-
.../clusters/parasilo/nodes/parasilo-13.json | 4 +-
.../clusters/parasilo/nodes/parasilo-14.json | 4 +-
.../clusters/parasilo/nodes/parasilo-15.json | 4 +-
.../clusters/parasilo/nodes/parasilo-17.json | 4 +-
.../clusters/parasilo/nodes/parasilo-18.json | 4 +-
.../clusters/parasilo/nodes/parasilo-19.json | 4 +-
.../clusters/parasilo/nodes/parasilo-2.json | 4 +-
.../clusters/parasilo/nodes/parasilo-20.json | 4 +-
.../clusters/parasilo/nodes/parasilo-21.json | 4 +-
.../clusters/parasilo/nodes/parasilo-22.json | 4 +-
.../clusters/parasilo/nodes/parasilo-23.json | 4 +-
.../clusters/parasilo/nodes/parasilo-24.json | 4 +-
.../clusters/parasilo/nodes/parasilo-25.json | 4 +-
.../clusters/parasilo/nodes/parasilo-26.json | 4 +-
.../clusters/parasilo/nodes/parasilo-27.json | 4 +-
.../clusters/parasilo/nodes/parasilo-28.json | 4 +-
.../clusters/parasilo/nodes/parasilo-3.json | 4 +-
.../clusters/parasilo/nodes/parasilo-4.json | 4 +-
.../clusters/parasilo/nodes/parasilo-5.json | 4 +-
.../clusters/parasilo/nodes/parasilo-6.json | 4 +-
.../clusters/parasilo/nodes/parasilo-7.json | 4 +-
.../clusters/parasilo/nodes/parasilo-8.json | 4 +-
.../clusters/parasilo/nodes/parasilo-9.json | 4 +-
.../rennes/network_equipments/c6509.json | 4 +-
.../sites/rennes/network_equipments/gw.json | 435 ++-------------
.../network_equipments/parasilo-sw-1.json | 513 ++++++++++++++++++
.../network_equipments/paravance-sw-1.json | 4 +-
.../network_equipments/paravance-sw-2.json | 4 +-
.../sites/rennes/network_equipments/sw-1.json | 140 +++++
.../grid5000/sites/rennes/networks/c6509.yaml | 6 +-
input/grid5000/sites/rennes/networks/gw.yaml | 127 +++++
.../sites/rennes/networks/mc-fake-sw.yaml | 4 +
.../{gw-rennes.yaml => parasilo-sw-1.yaml} | 70 +--
.../sites/rennes/networks/paravance-sw-1.yaml | 4 +-
.../sites/rennes/networks/paravance-sw-2.yaml | 4 +-
.../grid5000/sites/rennes/networks/sw-1.yaml | 29 +
40 files changed, 932 insertions(+), 520 deletions(-)
create mode 100644 data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
create mode 100644 data/grid5000/sites/rennes/network_equipments/sw-1.json
create mode 100644 input/grid5000/sites/rennes/networks/gw.yaml
rename input/grid5000/sites/rennes/networks/{gw-rennes.yaml => parasilo-sw-1.yaml} (81%)
create mode 100644 input/grid5000/sites/rennes/networks/sw-1.yaml
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 2b4392003b6..9a572224d97 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/2",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index c6588ebcb79..665bd071cf8 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/20",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index d59fae3366f..1ae6bd217e5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/22",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/21",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index 8dce85d36b4..1c12891ee1f 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/24",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 66ff0fc2069..c948c0c2b2d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/26",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/25",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index d3074adba4b..cdfa266b51e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/28",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/27",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index db38150c4df..3908189aee7 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/30",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index 7dd3d9911ba..230d47b9380 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/34",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/33",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 43bbd4eb369..3aa42fe108f 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/36",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index 3496fe3b1d5..4b2d7fc53e3 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/38",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/37",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index 34a00ddb48c..14609114e55 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/4",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 3a2099cb125..4f83843b247 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/40",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/39",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index bb4173d91ef..fade7d6f22c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/42",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/41",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 59f37fc46a9..d04ed681a02 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/44",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index 729557c02f5..0af843f14d5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/46",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index 5bf598de2a4..70f07a1d124 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/48",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/47",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index 2e6911b2131..59dd6ac5b94 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/2",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index 34dd955c23b..baa72ad3f99 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/4",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index afa2845dbf5..721cfcc41af 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/6",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index af959a6def5..749430e951e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/8",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet2/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index 266df79bd06..43b995cd31b 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/6",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index 2a9d5af2d32..cba2583f1da 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/8",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index cc6e149998d..b18bd5b2bb6 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/10",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index 5f6dc666b76..dda62b06cce 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/12",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 9c80b2d21bd..513c87e4225 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/14",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 589ee1cbdd1..7abfe202f63 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/16",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index 7bef724567c..0d3350eb5da 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -170,7 +170,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/18",
"vendor": "Intel"
},
@@ -194,7 +194,7 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": "gw",
+ "switch": "parasilo-sw-1",
"switch_port": "Ethernet1/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index 124e93ff883..359382fa4d1 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -16,10 +16,10 @@
{
},
{
- "kind": "router",
+ "kind": "switch",
"port": "Ethernet2/23",
"snmp_name": "TenGigabitEthernet1/2",
- "uid": "gw"
+ "uid": "parasilo-sw-1"
},
{
"kind": "switch",
diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index fe592f78c43..8a032426d02 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -1,24 +1,24 @@
{
"alias": [
{
- "ip": "172.17.111.204",
- "name": "parasilo-sw-1"
+ "ip": "172.17.111.211",
+ "name": "gw-rennes"
},
"gw-rennes"
],
"backplane_bps": 1440000000000,
"channels": {
- "port-channel2": {
+ "lag1": {
"kind": "switch",
- "port": "port-channel1",
- "rate": 80000000000,
- "uid": "paravance-sw-1"
+ "port": "lag1",
+ "rate": 200000000000,
+ "uid": "sw-1"
},
- "port-channel3": {
- "kind": "switch",
- "port": "port-channel4",
- "rate": 80000000000,
- "uid": "paravance-sw-2"
+ "lag2": {
+ "kind": "server",
+ "port": "lag2",
+ "rate": 50000000000,
+ "uid": "srv-data"
}
},
"ip": "172.16.111.254",
@@ -28,376 +28,96 @@
{
},
{
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
"ports": [
{
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/1",
- "uid": "parasilo-1"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/2",
- "uid": "parasilo-1"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/3",
- "uid": "parasilo-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/4",
- "uid": "parasilo-2"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/5",
- "uid": "parasilo-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/6",
- "uid": "parasilo-3"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/7",
- "uid": "parasilo-4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/8",
- "uid": "parasilo-4"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/9",
- "uid": "parasilo-5"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/10",
- "uid": "parasilo-5"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/11",
- "uid": "parasilo-6"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/12",
- "uid": "parasilo-6"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/13",
- "uid": "parasilo-7"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/14",
- "uid": "parasilo-7"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/15",
- "uid": "parasilo-8"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/16",
- "uid": "parasilo-8"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/17",
- "uid": "parasilo-9"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/18",
- "uid": "parasilo-9"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/19",
- "uid": "parasilo-10"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/20",
- "uid": "parasilo-10"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/21",
- "uid": "parasilo-11"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/22",
- "uid": "parasilo-11"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/23",
- "uid": "parasilo-12"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/24",
- "uid": "parasilo-12"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/25",
- "uid": "parasilo-13"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/26",
- "uid": "parasilo-13"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/27",
- "uid": "parasilo-14"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/28",
- "uid": "parasilo-14"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/29",
- "uid": "parasilo-15"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/30",
- "uid": "parasilo-15"
},
{
},
{
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/33",
- "uid": "parasilo-17"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/34",
- "uid": "parasilo-17"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/35",
- "uid": "parasilo-18"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/36",
- "uid": "parasilo-18"
+ "kind": "server",
+ "snmp_name": "1/1/31",
+ "uid": "srv-1"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/37",
- "uid": "parasilo-19"
+ "kind": "server",
+ "snmp_name": "1/1/32",
+ "uid": "srv-2"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/38",
- "uid": "parasilo-19"
+ "kind": "server",
+ "snmp_name": "1/1/33",
+ "uid": "srv-3"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/39",
- "uid": "parasilo-20"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/40",
- "uid": "parasilo-20"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/41",
- "uid": "parasilo-21"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/42",
- "uid": "parasilo-21"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/43",
- "uid": "parasilo-22"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/44",
- "uid": "parasilo-22"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/45",
- "uid": "parasilo-23"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/46",
- "uid": "parasilo-23"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet1/47",
- "uid": "parasilo-24"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/48",
- "uid": "parasilo-24"
},
{
"kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/49",
- "uid": "port-channel3"
+ "snmp_name": "1/1/35",
+ "uid": "lag2"
},
{
"kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/50",
- "uid": "port-channel3"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/51",
- "uid": "port-channel2"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet1/52",
- "uid": "port-channel2"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
- },
- {
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet2/1",
- "uid": "parasilo-25"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet2/2",
- "uid": "parasilo-25"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet2/3",
- "uid": "parasilo-26"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet2/4",
- "uid": "parasilo-26"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet2/5",
- "uid": "parasilo-27"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet2/6",
- "uid": "parasilo-27"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet2/7",
- "uid": "parasilo-28"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet2/8",
- "uid": "parasilo-28"
- },
- {
- },
- {
+ "snmp_name": "1/1/36",
+ "uid": "lag2"
},
{
},
@@ -416,104 +136,39 @@
{
},
{
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/45",
+ "uid": "parasilo-sw-1"
},
{
+ "kind": "backbone",
+ "rate": 10000000000,
+ "snmp_name": "1/1/46",
+ "uid": "renater-rennes"
},
{
},
{
},
{
- "kind": "switch",
- "port": "TenGigabitEthernet1/2",
- "snmp_name": "Ethernet2/23",
- "uid": "c6509"
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/49",
+ "uid": "lag1"
},
{
- "kind": "backbone",
- "snmp_name": "Ethernet2/24",
- "uid": "renater-rennes"
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/50",
+ "uid": "lag1"
}
],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
- }
- ],
- "metrics": [
- {
- "description": "Input byte counter for the network device port",
- "name": "network_ifacein_bytes_total",
- "period": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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": 15000,
- "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"
- }
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
}
],
- "model": "Nexus 56128P",
+ "model": "Aruba 8325-48Y8C",
"site": "rennes",
"snmp_community": "public",
"type": "network_equipment",
@@ -597,5 +252,5 @@
"name": "kavlan-16"
}
},
- "warranty": "2018-04-01"
+ "warranty": null
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
new file mode 100644
index 00000000000..795f73eebb2
--- /dev/null
+++ b/data/grid5000/sites/rennes/network_equipments/parasilo-sw-1.json
@@ -0,0 +1,513 @@
+{
+ "backplane_bps": 1440000000000,
+ "channels": {
+ "port-channel2": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 80000000000,
+ "uid": "paravance-sw-1"
+ },
+ "port-channel3": {
+ "kind": "switch",
+ "port": "port-channel4",
+ "rate": 80000000000,
+ "uid": "paravance-sw-2"
+ }
+ },
+ "ip": "172.17.111.204",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/1",
+ "uid": "parasilo-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/2",
+ "uid": "parasilo-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/3",
+ "uid": "parasilo-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/4",
+ "uid": "parasilo-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/5",
+ "uid": "parasilo-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/6",
+ "uid": "parasilo-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/7",
+ "uid": "parasilo-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/8",
+ "uid": "parasilo-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/9",
+ "uid": "parasilo-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/10",
+ "uid": "parasilo-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/11",
+ "uid": "parasilo-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/12",
+ "uid": "parasilo-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/13",
+ "uid": "parasilo-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/14",
+ "uid": "parasilo-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/15",
+ "uid": "parasilo-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/16",
+ "uid": "parasilo-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/17",
+ "uid": "parasilo-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/18",
+ "uid": "parasilo-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/19",
+ "uid": "parasilo-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/20",
+ "uid": "parasilo-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/21",
+ "uid": "parasilo-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/22",
+ "uid": "parasilo-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/23",
+ "uid": "parasilo-12"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/24",
+ "uid": "parasilo-12"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/25",
+ "uid": "parasilo-13"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/26",
+ "uid": "parasilo-13"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/27",
+ "uid": "parasilo-14"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/28",
+ "uid": "parasilo-14"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/29",
+ "uid": "parasilo-15"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/30",
+ "uid": "parasilo-15"
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/33",
+ "uid": "parasilo-17"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/34",
+ "uid": "parasilo-17"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/35",
+ "uid": "parasilo-18"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/36",
+ "uid": "parasilo-18"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/37",
+ "uid": "parasilo-19"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/38",
+ "uid": "parasilo-19"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/39",
+ "uid": "parasilo-20"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/40",
+ "uid": "parasilo-20"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/41",
+ "uid": "parasilo-21"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/42",
+ "uid": "parasilo-21"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/43",
+ "uid": "parasilo-22"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/44",
+ "uid": "parasilo-22"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/45",
+ "uid": "parasilo-23"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/46",
+ "uid": "parasilo-23"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet1/47",
+ "uid": "parasilo-24"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1/48",
+ "uid": "parasilo-24"
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet1/49",
+ "uid": "port-channel3"
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet1/50",
+ "uid": "port-channel3"
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet1/51",
+ "uid": "port-channel2"
+ },
+ {
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "Ethernet1/52",
+ "uid": "port-channel2"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ },
+ {
+ "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet2/1",
+ "uid": "parasilo-25"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet2/2",
+ "uid": "parasilo-25"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet2/3",
+ "uid": "parasilo-26"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet2/4",
+ "uid": "parasilo-26"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet2/5",
+ "uid": "parasilo-27"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet2/6",
+ "uid": "parasilo-27"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet2/7",
+ "uid": "parasilo-28"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet2/8",
+ "uid": "parasilo-28"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "port": "1/1/45",
+ "snmp_name": "Ethernet2/21",
+ "uid": "gw"
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "port": "TenGigabitEthernet1/2",
+ "snmp_name": "Ethernet2/23",
+ "uid": "c6509"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ }
+ ],
+ "metrics": [
+ {
+ "description": "Input byte counter for the network device port",
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": 15000,
+ "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": "Nexus 56128P",
+ "site": "rennes",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "parasilo-sw-1",
+ "warranty": "2018-04-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index 7642620f7a7..83c8e8aa033 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -2,10 +2,10 @@
"backplane_bps": 1440000000000,
"channels": {
"port-channel1": {
- "kind": "router",
+ "kind": "switch",
"port": "port-channel2",
"rate": 80000000000,
- "uid": "gw"
+ "uid": "parasilo-sw-1"
}
},
"ip": "172.17.111.206",
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index b14bc91d4ef..51497bd70cb 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -2,10 +2,10 @@
"backplane_bps": 1440000000000,
"channels": {
"port-channel4": {
- "kind": "router",
+ "kind": "switch",
"port": "port-channel3",
"rate": 80000000000,
- "uid": "gw"
+ "uid": "parasilo-sw-1"
}
},
"ip": "172.17.111.205",
diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1.json b/data/grid5000/sites/rennes/network_equipments/sw-1.json
new file mode 100644
index 00000000000..d3502dba556
--- /dev/null
+++ b/data/grid5000/sites/rennes/network_equipments/sw-1.json
@@ -0,0 +1,140 @@
+{
+ "backplane_bps": 1440000000000,
+ "channels": {
+ "lag1": {
+ "kind": "switch",
+ "port": "lag1",
+ "rate": 200000000000,
+ "uid": "gw"
+ }
+ },
+ "ip": "172.17.111.212",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/49",
+ "uid": "lag1"
+ },
+ {
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/50",
+ "uid": "lag1"
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "model": "Aruba 8325-48Y8C",
+ "site": "rennes",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-1",
+ "warranty": null
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 8746721980e..470f4d94f06 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -66,8 +66,8 @@ c6509:
model: WS-X6704-10GE
ports:
2:
- uid: gw
- kind: router
+ uid: parasilo-sw-1
+ kind: switch
port: Ethernet2/23
3:
uid: bigdata-sw
@@ -102,4 +102,4 @@ c6509:
rate: 1000000000
backplane_bps: 40000000000
model: WS-X6748-GE-TX
- ports: []
\ No newline at end of file
+ ports: []
diff --git a/input/grid5000/sites/rennes/networks/gw.yaml b/input/grid5000/sites/rennes/networks/gw.yaml
new file mode 100644
index 00000000000..1214f310c56
--- /dev/null
+++ b/input/grid5000/sites/rennes/networks/gw.yaml
@@ -0,0 +1,127 @@
+---
+gw:
+ model: Aruba 8325-48Y8C
+ warranty:
+ kind: router
+ site: rennes
+ snmp_community: public
+ ip: 172.16.111.254
+ ip6: 2001:660:4406:700::ffff:ffff
+ alias:
+ - name: gw-rennes
+ ip: 172.17.111.211
+ - gw-rennes
+ backplane_bps: 1440000000000
+ vlans:
+ "vlan100":
+ administrative: yes
+ addresses:
+ - 172.16.111.254
+ "vlan101":
+ administrative: yes
+ addresses:
+ - 172.17.111.254
+ "vlan500":
+ addresses:
+ - 192.168.4.19
+ "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.24.0.0/18
+ "vlan705":
+ name: kavlan-5
+ addresses:
+ - 10.24.64.0/18
+ "vlan706":
+ name: kavlan-6
+ addresses:
+ - 10.24.128.0/18
+ "vlan707":
+ name: kavlan-7
+ addresses:
+ - 10.24.192.0/18
+ "vlan708":
+ name: kavlan-8
+ addresses:
+ - 10.25.0.0/18
+ "vlan709":
+ name: kavlan-9
+ addresses:
+ - 10.25.64.0/18
+ "vlan716":
+ name: kavlan-16
+ addresses:
+ - 10.27.192.0/18
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25000000000
+ ports:
+ 31:
+ uid: srv-1
+ kind: server
+ 32:
+ uid: srv-2
+ kind: server
+ 33:
+ uid: srv-3
+ kind: server
+ 35:
+ uid: lag2
+ kind: channel
+ 36:
+ uid: lag2
+ kind: channel
+ 45:
+ uid: parasilo-sw-1
+ kind: switch
+ rate: 10000000000
+ 46:
+ uid: renater-rennes
+ kind: backbone
+ rate: 10000000000
+# 47:
+# uid: lag3
+# kind: channel
+# rate: 10000000000
+# 48:
+# uid: lag3
+# kind: channel
+# rate: 10000000000
+ 49:
+ uid: lag1
+ kind: channel
+ rate: 100000000000
+ 50:
+ uid: lag1
+ kind: channel
+ rate: 100000000000
+ channels:
+ lag1:
+ kind: switch
+ rate: 200000000000
+ uid: sw-1
+ port: lag1
+ lag2:
+ kind: server
+ rate: 50000000000
+ uid: srv-data
+ port: lag2
+# lag3:
+# kind: switch
+# rate: 50000000000
+# uid: mc-fake-sw
+# port: 999
diff --git a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml b/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
index 13ab2de12d7..cb0e8aed3d4 100644
--- a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
@@ -16,3 +16,7 @@ mc-fake-sw:
uid: abacus25-1
26:
uid: abacus25-2
+# 999:
+# uid: gw
+# kind: router
+# port: lag3
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
similarity index 81%
rename from input/grid5000/sites/rennes/networks/gw-rennes.yaml
rename to input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
index 0c3cec16d29..074cd8657f9 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/parasilo-sw-1.yaml
@@ -1,16 +1,11 @@
---
-gw:
+parasilo-sw-1:
model: Nexus 56128P
warranty: 2018-04-01
- kind: router
+ kind: switch
site: rennes
snmp_community: public
- ip: 172.16.111.254
- ip6: 2001:660:4406:700::ffff:ffff
- alias:
- - name: parasilo-sw-1
- ip: 172.17.111.204
- - gw-rennes
+ ip: 172.17.111.204
backplane_bps: 1440000000000
metrics:
- name: network_ifacein_bytes_total
@@ -61,58 +56,6 @@ gw:
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.111.254
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.111.254
- "vlan500":
- addresses:
- - 192.168.4.19
- "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.24.0.0/18
- "vlan705":
- name: kavlan-5
- addresses:
- - 10.24.64.0/18
- "vlan706":
- name: kavlan-6
- addresses:
- - 10.24.128.0/18
- "vlan707":
- name: kavlan-7
- addresses:
- - 10.24.192.0/18
- "vlan708":
- name: kavlan-8
- addresses:
- - 10.25.0.0/18
- "vlan709":
- name: kavlan-9
- addresses:
- - 10.25.64.0/18
- "vlan716":
- name: kavlan-16
- addresses:
- - 10.27.192.0/18
linecards:
1:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -250,13 +193,14 @@ gw:
uid: parasilo-28-eth1
8:
uid: parasilo-28
+ 21:
+ uid: gw
+ kind: router
+ port: 1/1/45
23:
uid: c6509
kind: switch
port: TenGigabitEthernet1/2
- 24:
- uid: renater-rennes
- kind: backbone
channels:
port-channel3:
kind: switch
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index b37e995c6d8..ea38e4c4dbe 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -223,7 +223,7 @@ paravance-sw-1:
uid: paravance-36
channels:
port-channel1:
- uid: gw
+ uid: parasilo-sw-1
port: port-channel2
rate: 80000000000
- kind: router
+ kind: switch
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index fe10431ddf6..9a7d756c26f 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -223,7 +223,7 @@ paravance-sw-2:
uid: paravance-72
channels:
port-channel4:
- uid: gw
+ uid: parasilo-sw-1
port: port-channel3
rate: 80000000000
- kind: router
+ kind: switch
diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml
new file mode 100644
index 00000000000..e53339ed4d9
--- /dev/null
+++ b/input/grid5000/sites/rennes/networks/sw-1.yaml
@@ -0,0 +1,29 @@
+---
+sw-1:
+ model: Aruba 8325-48Y8C
+ warranty:
+ kind: switch
+ site: rennes
+ ip: 172.17.111.212
+ snmp_community: public
+ backplane_bps: 1440000000000
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25000000000
+ ports:
+ 49:
+ uid: lag1
+ kind: channel
+ rate: 100000000000
+ 50:
+ uid: lag1
+ kind: channel
+ rate: 100000000000
+ channels:
+ lag1:
+ kind: switch
+ rate: 200000000000
+ uid: gw
+ port: lag1
--
GitLab