From 4eb8783d54c178b16227eb2fa4a2e406e0492d4b Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 19 May 2025 14:12:57 +0200
Subject: [PATCH 1/4] [strasbourg][network] New network onfiguration proposal
---
.../sites/strasbourg/networks/sw-admin.yaml | 40 +++++++++----------
.../sites/strasbourg/networks/sw-core.yaml | 34 ++++++++--------
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index 953fa82b844..2f6ba3fd2ad 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -29,43 +29,43 @@ sw-admin:
11: fleckenstein-9-bmc
12: fleckenstein-10-bmc
13:
- uid: engelbourg-2-eth0
+ uid: engelbourg-1-eth0
kind: node
14:
- uid: engelbourg-3-eth0
+ uid: engelbourg-2-eth0
kind: node
15:
+ uid: engelbourg-3-eth0
+ kind: node
+ 16:
uid: engelbourg-4-eth0
kind: node
- 16:
+ 17:
uid: engelbourg-5-eth0
kind: node
- 17:
+ 18:
uid: engelbourg-6-eth0
kind: node
- 18:
+ 19:
uid: engelbourg-7-eth0
kind: node
- 19:
+ 20:
uid: engelbourg-8-eth0
kind: node
- # 20:
+ # 21:
# uid: ramstein-1
# kind: node
21: sw-core-mgmt
- 22: iotlab-devstrasbourg-bmc
- 23: inetlab-devaportnet-bmc
- 24: inetlab-stonet-bmc
- 25: inetlab-ibat-bmc
- 26: inetlab-wikinet-bmc
- 27: inetlab-soknet-bmc
- 28: iotlab-strasbourg-bmc
- 29: iotlab-devwww-bmc
- 30: iotlab-www-bmc
- 31:
- uid: engelbourg-1-eth0 # Fake entry
- kind: node
- 48:
+ 22:
uid: sw-core
kind: switch
rate: 100_000_000_000
+ 40: iotlab-devstrasbourg-bmc
+ 41: inetlab-devaportnet-bmc
+ 42: inetlab-stonet-bmc
+ 43: inetlab-ibat-bmc
+ 44: inetlab-wikinet-bmc
+ 45: inetlab-soknet-bmc
+ 46: iotlab-strasbourg-bmc
+ 47: iotlab-devwww-bmc
+ 48: iotlab-www-bmc
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index d6e16f9695b..e771d603a66 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -78,23 +78,23 @@ sw-core:
44: fleckenstein-8-eth6
48: fleckenstein-9-eth6
52: fleckenstein-10-eth6
- 56: engelbourg-2-eth1
- 60: engelbourg-2-eth2
- 64: engelbourg-3-eth1
- 68: engelbourg-3-eth2
- 72: engelbourg-4-eth1
- 76: engelbourg-4-eth2
- 80: engelbourg-5-eth1
- 84: engelbourg-5-eth2
- 88: engelbourg-6-eth1
- 92: engelbourg-6-eth2
- 96: engelbourg-7-eth1
- 100: engelbourg-7-eth2
- 104: engelbourg-8-eth1
- 108: engelbourg-8-eth2
- 112:
- 116:
- 120:
+ 56: engelbourg-1-eth1
+ 60: engelbourg-1-eth2
+ 64: engelbourg-2-eth1
+ 68: engelbourg-2-eth2
+ 72: engelbourg-3-eth1
+ 76: engelbourg-3-eth2
+ 80: engelbourg-4-eth1
+ 84: engelbourg-4-eth2
+ 88: engelbourg-5-eth1
+ 92: engelbourg-5-eth2
+ 96: engelbourg-6-eth1
+ 100: engelbourg-6-eth2
+ 104: engelbourg-7-eth1
+ 108: engelbourg-7-eth2
+ 112: engelbourg-8-eth1
+ 116: engelbourg-8-eth1
+ 120: ramstein-1
124:
uid: sw-admin
kind: switch
--
GitLab
From 519e9709ab203c634a6bf1ec199a18769a649e04 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 19 May 2025 14:32:46 +0200
Subject: [PATCH 2/4] [strasbourg][pdus] Create basic template for pdus
description
---
input/grid5000/sites/strasbourg/pdus.yaml | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 input/grid5000/sites/strasbourg/pdus.yaml
diff --git a/input/grid5000/sites/strasbourg/pdus.yaml b/input/grid5000/sites/strasbourg/pdus.yaml
new file mode 100644
index 00000000000..e427482b16a
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/pdus.yaml
@@ -0,0 +1,12 @@
+---
+pdus:
+ e013_a23_pdu_a:
+ vendor: unknown
+ model: unknown
+ ip: unknown
+ mac: unknown
+ e013_a23_pdu_bhq:
+ vendor: unknown
+ model: unknown
+ ip: unknown
+ mac: unknown
--
GitLab
From 716248e89b9b1cddc5e12aa24b5d929a30151612 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 19 May 2025 15:01:18 +0200
Subject: [PATCH 3/4] [strasbourg][network] Add generated json files
---
.../engelbourg/nodes/engelbourg-1.json | 2 +-
.../engelbourg/nodes/engelbourg-2.json | 2 +-
.../engelbourg/nodes/engelbourg-3.json | 2 +-
.../engelbourg/nodes/engelbourg-4.json | 2 +-
.../engelbourg/nodes/engelbourg-5.json | 2 +-
.../engelbourg/nodes/engelbourg-6.json | 2 +-
.../engelbourg/nodes/engelbourg-7.json | 2 +-
.../engelbourg/nodes/engelbourg-8.json | 2 +-
.../network_equipments/sw-admin.json | 80 +++++++++----------
.../network_equipments/sw-core.json | 40 ++++++----
10 files changed, 74 insertions(+), 62 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index b46f496c5c0..961beb6e8cf 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet31",
+ "switch_port": "Ethernet13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 217aa37af88..59084cccc06 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet13",
+ "switch_port": "Ethernet14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 13fa4c6ebaf..7fb4726ee3a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet14",
+ "switch_port": "Ethernet15",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index ca3967c9794..7f24a336b97 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet15",
+ "switch_port": "Ethernet16",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index 78346222745..3f13df50cc1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet16",
+ "switch_port": "Ethernet17",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 65298fa25ad..cae92c20bf4 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet17",
+ "switch_port": "Ethernet18",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 82e46fb1ac6..a3e059431cc 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet18",
+ "switch_port": "Ethernet19",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index 7045e09fae8..baf8f2f3e2d 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -57,7 +57,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-admin",
- "switch_port": "Ethernet19",
+ "switch_port": "Ethernet20",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index ba4781cfd37..a46c9df2e3a 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -79,45 +79,49 @@
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet13",
- "uid": "engelbourg-2"
+ "uid": "engelbourg-1"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet14",
- "uid": "engelbourg-3"
+ "uid": "engelbourg-2"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet15",
- "uid": "engelbourg-4"
+ "uid": "engelbourg-3"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet16",
- "uid": "engelbourg-5"
+ "uid": "engelbourg-4"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet17",
- "uid": "engelbourg-6"
+ "uid": "engelbourg-5"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet18",
- "uid": "engelbourg-7"
+ "uid": "engelbourg-6"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet19",
- "uid": "engelbourg-8"
+ "uid": "engelbourg-7"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet20",
+ "uid": "engelbourg-8"
},
{
"kind": "other",
@@ -125,55 +129,28 @@
"uid": "sw-core-mgmt"
},
{
- "kind": "other",
+ "kind": "switch",
+ "rate": 100000000000,
"snmp_name": "Ethernet22",
- "uid": "iotlab-devstrasbourg-bmc"
+ "uid": "sw-core"
},
{
- "kind": "other",
- "snmp_name": "Ethernet23",
- "uid": "inetlab-devaportnet-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet24",
- "uid": "inetlab-stonet-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet25",
- "uid": "inetlab-ibat-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet26",
- "uid": "inetlab-wikinet-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet27",
- "uid": "inetlab-soknet-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet28",
- "uid": "iotlab-strasbourg-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet29",
- "uid": "iotlab-devwww-bmc"
},
{
- "kind": "other",
- "snmp_name": "Ethernet30",
- "uid": "iotlab-www-bmc"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet31",
- "uid": "engelbourg-1"
},
{
},
@@ -192,26 +169,49 @@
{
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet40",
+ "uid": "iotlab-devstrasbourg-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet41",
+ "uid": "inetlab-devaportnet-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet42",
+ "uid": "inetlab-stonet-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet43",
+ "uid": "inetlab-ibat-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet44",
+ "uid": "inetlab-wikinet-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet45",
+ "uid": "inetlab-soknet-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet46",
+ "uid": "iotlab-strasbourg-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "Ethernet47",
+ "uid": "iotlab-devwww-bmc"
},
{
- "kind": "switch",
- "rate": 100000000000,
+ "kind": "other",
"snmp_name": "Ethernet48",
- "uid": "sw-core"
+ "uid": "iotlab-www-bmc"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index cd946283842..bc78bc5c8b2 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -244,7 +244,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet56",
- "uid": "engelbourg-2"
+ "uid": "engelbourg-1"
},
{
},
@@ -256,7 +256,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet60",
- "uid": "engelbourg-2"
+ "uid": "engelbourg-1"
},
{
},
@@ -268,7 +268,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet64",
- "uid": "engelbourg-3"
+ "uid": "engelbourg-2"
},
{
},
@@ -280,7 +280,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet68",
- "uid": "engelbourg-3"
+ "uid": "engelbourg-2"
},
{
},
@@ -292,7 +292,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet72",
- "uid": "engelbourg-4"
+ "uid": "engelbourg-3"
},
{
},
@@ -304,7 +304,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet76",
- "uid": "engelbourg-4"
+ "uid": "engelbourg-3"
},
{
},
@@ -316,7 +316,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet80",
- "uid": "engelbourg-5"
+ "uid": "engelbourg-4"
},
{
},
@@ -328,7 +328,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet84",
- "uid": "engelbourg-5"
+ "uid": "engelbourg-4"
},
{
},
@@ -340,7 +340,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet88",
- "uid": "engelbourg-6"
+ "uid": "engelbourg-5"
},
{
},
@@ -352,7 +352,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet92",
- "uid": "engelbourg-6"
+ "uid": "engelbourg-5"
},
{
},
@@ -364,7 +364,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet96",
- "uid": "engelbourg-7"
+ "uid": "engelbourg-6"
},
{
},
@@ -376,7 +376,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet100",
- "uid": "engelbourg-7"
+ "uid": "engelbourg-6"
},
{
},
@@ -388,7 +388,7 @@
"kind": "node",
"port": "eth1",
"snmp_name": "Ethernet104",
- "uid": "engelbourg-8"
+ "uid": "engelbourg-7"
},
{
},
@@ -400,7 +400,7 @@
"kind": "node",
"port": "eth2",
"snmp_name": "Ethernet108",
- "uid": "engelbourg-8"
+ "uid": "engelbourg-7"
},
{
},
@@ -409,6 +409,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet112",
+ "uid": "engelbourg-8"
},
{
},
@@ -417,6 +421,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet116",
+ "uid": "engelbourg-8"
},
{
},
@@ -425,6 +433,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet120",
+ "uid": "ramstein-1"
},
{
},
--
GitLab
From 2bacb3ad98311fc4b6d7383423ebc420190cc96d Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 19 May 2025 15:01:32 +0200
Subject: [PATCH 4/4] [strasbourg][pdus] Add generated json files
---
data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_a.json | 8 ++++++++
data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_bhq.json | 8 ++++++++
input/grid5000/sites/strasbourg/pdus.yaml | 4 ++--
3 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_a.json
create mode 100644 data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_bhq.json
diff --git a/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_a.json b/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_a.json
new file mode 100644
index 00000000000..bde069ea7af
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_a.json
@@ -0,0 +1,8 @@
+{
+ "ip": "0.0.0.0",
+ "mac": "unknown",
+ "model": "unknown",
+ "type": "pdu",
+ "uid": "e013_a23_pdu_a",
+ "vendor": "unknown"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_bhq.json b/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_bhq.json
new file mode 100644
index 00000000000..5442cda9442
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/pdus/e013_a23_pdu_bhq.json
@@ -0,0 +1,8 @@
+{
+ "ip": "0.0.0.0",
+ "mac": "unknown",
+ "model": "unknown",
+ "type": "pdu",
+ "uid": "e013_a23_pdu_bhq",
+ "vendor": "unknown"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/strasbourg/pdus.yaml b/input/grid5000/sites/strasbourg/pdus.yaml
index e427482b16a..73253151506 100644
--- a/input/grid5000/sites/strasbourg/pdus.yaml
+++ b/input/grid5000/sites/strasbourg/pdus.yaml
@@ -3,10 +3,10 @@ pdus:
e013_a23_pdu_a:
vendor: unknown
model: unknown
- ip: unknown
+ ip: 0.0.0.0
mac: unknown
e013_a23_pdu_bhq:
vendor: unknown
model: unknown
- ip: unknown
+ ip: 0.0.0.0
mac: unknown
--
GitLab