From a55e097a2f022edd65f51290e37fac97813a0415 Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Fri, 7 Feb 2025 15:52:30 +0100
Subject: [PATCH] [lille][network] update equipments description
---
.../{sw-chiclet-3.json => gw.json} | 18 ++++-------
.../sites/lille/network_equipments/sw-1.json | 32 +++++++++++++++++--
.../network_equipments/sw-chiclet-1.json | 6 +++-
.../network_equipments/sw-chiclet-2.json | 30 +++++++++++++++++
.../{sw-chiclet-3.yaml => gw-lille.yaml} | 14 ++++----
input/grid5000/sites/lille/networks/sw-1.yaml | 31 ++++++++++++++++--
.../sites/lille/networks/sw-chiclet-1.yaml | 6 +++-
.../sites/lille/networks/sw-chiclet-2.yaml | 30 ++++++++++++++++-
8 files changed, 142 insertions(+), 25 deletions(-)
rename data/grid5000/sites/lille/network_equipments/{sw-chiclet-3.json => gw.json} (96%)
rename input/grid5000/sites/lille/networks/{sw-chiclet-3.yaml => gw-lille.yaml} (95%)
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/gw.json
similarity index 96%
rename from data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
rename to data/grid5000/sites/lille/network_equipments/gw.json
index aa728f1c813..6a328c58676 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/gw.json
@@ -1,14 +1,6 @@
{
"alias": [
- {
- "ip": "172.16.47.254",
- "ip6": "2001:660:4406:200::ffff:ffff",
- "name": "gw"
- },
- {
- "ip": "172.17.47.254",
- "name": "gw-adm"
- }
+ "gw-lille"
],
"backplane_bps": 36000000000000,
"channels": {
@@ -19,7 +11,8 @@
"uid": "sw-1"
}
},
- "ip": "172.17.47.223",
+ "ip": "172.16.47.254",
+ "ip6": "2001:660:4406:200::ffff:ffff",
"kind": "router",
"linecards": [
{
@@ -32,6 +25,9 @@
{
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/1",
+ "uid": "pve-dmz-north-2"
},
{
},
@@ -235,7 +231,7 @@
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "sw-chiclet-3",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
diff --git a/data/grid5000/sites/lille/network_equipments/sw-1.json b/data/grid5000/sites/lille/network_equipments/sw-1.json
index 884bc1608f6..c969005ba9f 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-1.json
@@ -7,11 +7,17 @@
],
"backplane_bps": 1440000000000,
"channels": {
+ "lag1": {
+ "kind": "server",
+ "port": "lacp",
+ "rate": 50000000000,
+ "uid": "srv-data2"
+ },
"lag2": {
- "kind": "switch",
+ "kind": "router",
"port": "port-channel1",
"rate": 200000000000,
- "uid": "sw-chiclet-3"
+ "uid": "gw"
}
},
"ip": "172.17.47.224",
@@ -26,16 +32,34 @@
{
},
{
+ "kind": "server",
+ "snmp_name": "1/1/1",
+ "uid": "pve-1"
},
{
+ "kind": "server",
+ "snmp_name": "1/1/2",
+ "uid": "pve-1-eth1"
},
{
+ "kind": "server",
+ "snmp_name": "1/1/3",
+ "uid": "pve-2"
},
{
+ "kind": "server",
+ "snmp_name": "1/1/4",
+ "uid": "pve-2-eth1"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/5",
+ "uid": "lag1"
},
{
+ "kind": "channel",
+ "snmp_name": "1/1/6",
+ "uid": "lag1"
},
{
"kind": "node",
@@ -206,6 +230,9 @@
{
},
{
+ "kind": "server",
+ "snmp_name": "1/1/39",
+ "uid": "pve-4"
},
{
},
@@ -223,6 +250,7 @@
},
{
"kind": "switch",
+ "rate": 1000000000,
"snmp_name": "1/1/47",
"uid": "sw-admin6"
},
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 255d4d62f74..78541974159 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -41,7 +41,7 @@
{
"kind": "node",
"port": "eth0",
- "rate": 1000000000,
+ "rate": 10000000000,
"snmp_name": "Ethernet1/4",
"uid": "chifflot-4"
},
@@ -236,6 +236,10 @@
{
},
{
+ "kind": "switch",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet1/48",
+ "uid": "sw-admin5"
},
{
},
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index a0bfaa13e92..79955ce2648 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -6,6 +6,18 @@
"port": "port-channel1",
"rate": 200000000000,
"uid": "sw-chiclet-1"
+ },
+ "port-channel3": {
+ "kind": "server",
+ "port": "port-channel3",
+ "rate": 20000000000,
+ "uid": "granche-srv1"
+ },
+ "port-channel4": {
+ "kind": "server",
+ "port": "port-channel4",
+ "rate": 20000000000,
+ "uid": "granche-srv2"
}
},
"ip": "172.17.47.222",
@@ -45,22 +57,40 @@
{
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/13",
+ "uid": "chiterne"
},
{
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/15",
+ "uid": "port-channel3"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/16",
+ "uid": "port-channel3"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/17",
+ "uid": "port-channel4"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/18",
+ "uid": "port-channel4"
},
{
},
{
},
{
+ "kind": "server",
+ "snmp_name": "Ethernet1/21",
+ "uid": "gwol-north"
},
{
},
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/gw-lille.yaml
similarity index 95%
rename from input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
rename to input/grid5000/sites/lille/networks/gw-lille.yaml
index d1567291368..5e9ba63e821 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/gw-lille.yaml
@@ -1,15 +1,12 @@
---
-sw-chiclet-3:
+gw:
model: cisco 93180YC-EX
serial: FDO20392L7J
warranty: 2025-10-24
alias:
- - name: gw
- ip: 172.16.47.254
- ip6: 2001:660:4406:200::ffff:ffff
- - name: gw-adm
- ip: 172.17.47.254
- ip: 172.17.47.223
+ - gw-lille
+ ip: 172.16.47.254
+ ip6: 2001:660:4406:200::ffff:ffff
kind: router
managed_by_us: true
site: lille
@@ -123,6 +120,9 @@ sw-chiclet-3:
backplane_bps: 36000000000000
rate: 10000000000
ports:
+ 1:
+ uid: pve-dmz-north-2
+ kind: server
47:
uid: renater-lille
kind: backbone
diff --git a/input/grid5000/sites/lille/networks/sw-1.yaml b/input/grid5000/sites/lille/networks/sw-1.yaml
index 573c42fa7a7..925bab8c10b 100644
--- a/input/grid5000/sites/lille/networks/sw-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-1.yaml
@@ -18,6 +18,24 @@ sw-1:
rate: 25000000000
kind: node
ports:
+ 1:
+ uid: pve-1
+ kind: server
+ 2:
+ uid: pve-1-eth1
+ kind: server
+ 3:
+ uid: pve-2
+ kind: server
+ 4:
+ uid: pve-2-eth1
+ kind: server
+ 5:
+ uid: lag1
+ kind: channel
+ 6:
+ uid: lag1
+ kind: channel
7:
uid: chuc-1
8:
@@ -70,9 +88,13 @@ sw-1:
uid: chirop-5
32:
uid: chirop-5-eth1
+ 39:
+ uid: pve-4
+ kind: server
47:
uid: sw-admin6
kind: switch
+ rate: 1000000000
48:
uid: sw-chiclet-2
kind: switch
@@ -83,8 +105,13 @@ sw-1:
uid: lag2
kind: channel
channels:
+ lag1:
+ uid: srv-data2
+ kind: server
+ port: lacp
+ rate: 50000000000
lag2:
port: port-channel1
- uid: sw-chiclet-3
- kind: switch
+ uid: gw
+ kind: router
rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 3b064e5e41b..c22d09614e3 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -74,7 +74,7 @@ sw-chiclet-1:
uid: chifflot-3
4:
uid: chifflot-4
- rate: 1000000000
+ rate: 10000000000
5:
uid: chifflot-5
6:
@@ -127,6 +127,10 @@ sw-chiclet-1:
uid: chiclet-7-eth1
32:
uid: chiclet-8-eth1
+ 48:
+ uid: sw-admin5
+ kind: switch
+ rate: 1000000000
53:
uid: port-channel1
kind: channel
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index dbc95f93580..3ea3c987d4c 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -66,13 +66,31 @@ sw-chiclet-2:
backplane_bps: 36000000000000
rate: 10000000000
ports:
+ 13:
+ uid: chiterne
+ kind: server
+ 15:
+ uid: port-channel3
+ kind: channel
+ 16:
+ uid: port-channel3
+ kind: channel
+ 17:
+ uid: port-channel4
+ kind: channel
+ 18:
+ uid: port-channel4
+ kind: channel
+ 21:
+ uid: gwol-north
+ kind: server
35:
uid: labo
kind: other
rate: 1000000000
46:
uid: sw-1
- kind: switch
+ kind: switch
51:
uid: port-channel1
kind: channel
@@ -87,3 +105,13 @@ sw-chiclet-2:
uid: sw-chiclet-1
kind: switch
rate: 200000000000
+ port-channel3:
+ port: port-channel3
+ uid: granche-srv1
+ kind: server
+ rate: 20000000000
+ port-channel4:
+ port: port-channel4
+ uid: granche-srv2
+ kind: server
+ rate: 20000000000
--
GitLab