From 634720ef6f2519767d2ce3e2879890ca79039b5e Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Wed, 22 Jan 2025 13:28:45 +0100
Subject: [PATCH 1/7] [sophia][network] add sw-1, sw-3 and remove uvb from gw
---
.../sophia/clusters/musa/nodes/musa-1.json | 4 +-
.../sophia/clusters/musa/nodes/musa-2.json | 4 +-
.../sophia/clusters/musa/nodes/musa-3.json | 4 +-
.../sophia/clusters/musa/nodes/musa-4.json | 4 +-
.../sophia/clusters/musa/nodes/musa-5.json | 4 +-
.../sophia/clusters/musa/nodes/musa-6.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-10.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-11.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-12.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-9.json | 4 +-
.../sites/sophia/clusters/uvb/uvb.json | 88 --------
.../sites/sophia/network_equipments/gw.json | 31 ++-
.../sites/sophia/network_equipments/sw-1.json | 199 ++++++++++++++++++
.../sites/sophia/networks/gw-sophia.yaml | 9 +-
.../grid5000/sites/sophia/networks/sw-1.yaml | 107 ++++++++++
.../grid5000/sites/sophia/networks/sw-3.yaml | 96 +++++++++
16 files changed, 442 insertions(+), 128 deletions(-)
create mode 100644 data/grid5000/sites/sophia/network_equipments/sw-1.json
create mode 100644 input/grid5000/sites/sophia/networks/sw-1.yaml
create mode 100644 input/grid5000/sites/sophia/networks/sw-3.yaml
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
index af6ed71fbe7..3df94afc356 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/31",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
index 19c1f559632..1220d781d12 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/32",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index 8aefc2a4fad..b48ed359cdd 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/33",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index c7d8ef7de9f..b67a523d22c 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/34",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 93b435cbd6d..a075db444f0 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/35",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index c5bbe22d161..b5ac1184b4e 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/36",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 9ca74e3076c..2572a63083c 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "gw",
- "switch_port": "GigabitEthernet9/3",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index 98edc9f14bf..f94b6a4db95 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "gw",
- "switch_port": "GigabitEthernet4/9",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index ec66757c1e2..3daed83a644 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "gw",
- "switch_port": "GigabitEthernet4/1",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index 84e6bc775b6..d55f23219f9 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "gw",
- "switch_port": "GigabitEthernet9/1",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index c4ed25d3c6b..171094abfdc 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -48,94 +48,6 @@
"port": 9100,
"protocol": "prometheus"
}
- },
- {
- "description": "Input byte counter for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifacein_bytes_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Output byte counter for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifaceout_bytes_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Input packet counter for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifacein_packets_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Output packet counter for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifaceout_packets_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Input counter of discarded packets for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifacein_packets_discard_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Output counter of discarded packets for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifaceout_packets_discard_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Input counter of packet errors for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifacein_packets_error_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
- },
- {
- "description": "Output counter of packet errors for the network device port",
- "labels": {
- "interface": "eth0"
- },
- "name": "network_ifaceout_packets_error_total",
- "period": 1000,
- "source": {
- "protocol": "network_equipment"
- }
}
],
"model": "Dell PowerEdge C6100",
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 15f5c66e33a..45aa1db08b0 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -99,10 +99,6 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "GigabitEthernet4/1",
- "uid": "uvb-12"
},
{
},
@@ -119,10 +115,6 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "GigabitEthernet4/9",
- "uid": "uvb-11"
},
{
},
@@ -218,10 +210,6 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "GigabitEthernet9/1",
- "uid": "uvb-9"
},
{
"kind": "server",
@@ -229,10 +217,21 @@
"uid": "srv-data"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "GigabitEthernet9/3",
- "uid": "uvb-10"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "GigabitEthernet9/9",
+ "uid": "sw-1"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-1.json b/data/grid5000/sites/sophia/network_equipments/sw-1.json
new file mode 100644
index 00000000000..9f068318a8a
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-1.json
@@ -0,0 +1,199 @@
+{
+ "backplane_bps": 1440000000000,
+ "channels": {
+ "lag1": {
+ "kind": "server",
+ "port": "lag1",
+ "rate": 500000000000,
+ "uid": "srv-data1"
+ },
+ "lag2": {
+ "kind": "server",
+ "port": "lag2",
+ "rate": 500000000000,
+ "uid": "srv-data2"
+ },
+ "lag3": {
+ "kind": "server",
+ "port": "lag3",
+ "rate": 500000000000,
+ "uid": "srv-data3"
+ },
+ "lag4": {
+ "kind": "server",
+ "port": "lag4",
+ "rate": 200000000000,
+ "uid": "srv-data4"
+ }
+ },
+ "ip": "172.17.143.251",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/3",
+ "uid": "lag1"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/4",
+ "uid": "lag1"
+ },
+ {
+ "kind": "channel",
+ "rate": 25000000000,
+ "snmp_name": "1/1/5",
+ "uid": "lag2"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/6",
+ "uid": "lag2"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/7",
+ "uid": "lag3"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "1/1/8",
+ "uid": "lag3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/31",
+ "uid": "musa-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/32",
+ "uid": "musa-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/33",
+ "uid": "musa-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/34",
+ "uid": "musa-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/35",
+ "uid": "musa-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/36",
+ "uid": "musa-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/40",
+ "uid": "lag4"
+ },
+ {
+ "kind": "channel",
+ "rate": 100000000000,
+ "snmp_name": "1/1/41",
+ "uid": "lag4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "rate": 10000000000,
+ "snmp_name": "1/1/46",
+ "uid": "gw"
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 8325-48Y8C",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-1",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 5cac2d022c3..e6775aae835 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -170,12 +170,12 @@ gw:
backplane_bps: 24000000000
rate: 1000000000
ports:
- 1: uvb-12
+ 1:
2:
4:
6:
8:
- 9: uvb-11
+ 9:
10:
12:
14:
@@ -203,11 +203,12 @@ gw:
backplane_bps: 12000000000
rate: 1000000000
ports:
- 1: uvb-9
2:
uid: srv-data
kind: server
- 3: uvb-10
+ 9:
+ uid: sw-1
+ kind: switch
6:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/sophia/networks/sw-1.yaml b/input/grid5000/sites/sophia/networks/sw-1.yaml
new file mode 100644
index 00000000000..6b9969c9dbe
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-1.yaml
@@ -0,0 +1,107 @@
+---
+sw-1:
+ model: Aruba 8325-48Y8C
+ warranty: 2048-05
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.251
+ snmp_community: public
+ backplane_bps: 1440000000000
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 25000000000
+ kind: node
+ ports:
+ 1:
+ 2:
+ 3:
+ uid: lag1
+ kind: channel
+ 4:
+ uid: lag1
+ kind: channel
+
+ 5:
+ uid: lag2
+ kind: channel
+ rate: 25000000000
+ 6:
+ uid: lag2
+ kind: channel
+
+ 7:
+ uid: lag3
+ kind: channel
+ 8:
+ uid: lag3
+ kind: channel
+ 9:
+ 10:
+ 11:
+ 12:
+ 13:
+ 14:
+ 15:
+ 16:
+ 17:
+ 18:
+ 19:
+ 20:
+ 21:
+ 22:
+ 23:
+ 24:
+ 25:
+ 26:
+ 27:
+ 28:
+ 29:
+ 30:
+ 31:
+ uid: musa-1
+ 32:
+ uid: musa-2
+ 33:
+ uid: musa-3
+ 34:
+ uid: musa-4
+ 35:
+ uid: musa-5
+ 36:
+ uid: musa-6
+ 40:
+ uid: lag4
+ kind: channel
+ rate: 100000000000
+ 41:
+ uid: lag4
+ kind: channel
+ rate: 100000000000
+ 46:
+ uid: gw
+ kind: router
+ rate: 10000000000
+ channels:
+ lag1:
+ kind: server
+ rate: 500000000000
+ uid: srv-data1
+ port: lag1
+ lag2:
+ kind: server
+ rate: 500000000000
+ uid: srv-data2
+ port: lag2
+ lag3:
+ kind: server
+ rate: 500000000000
+ uid: srv-data3
+ port: lag3
+ lag4:
+ kind: server
+ rate: 200000000000
+ uid: srv-data4
+ port: lag4
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
new file mode 100644
index 00000000000..8af86aca18d
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -0,0 +1,96 @@
+---
+sw-1:
+ model: Aruba 6300M
+ warranty: 2048-05
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.247
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: uvb-11
+ 2:
+ uid: uvb-12
+ 3:
+ uid: mercantour1-15
+ 4:
+ uid: mercantour1-16
+ 5:
+ uid: mercantour1-11
+ 6:
+ uid: mercantour1-12
+ 7:
+ uid: mercantour1-7
+ 8:
+ uid: mercantour1-8
+ 9:
+ uid: mercantour1-3
+ 10:
+ uid: mercantour1-4
+ 11:
+ uid: mercantour2-7
+ 12:
+ uid: mercantour2-8
+ 13:
+ uid: mercantour2-3
+ 14:
+ uid: mercantour2-4
+ 33:
+ uid: mercantour2-2
+ 34:
+ uid: mercantour2-1
+ 35:
+ uid: mercantour2-6
+ 36:
+ uid: mercantour2-5
+ 37:
+ uid: mercantour1-2
+ 38:
+ uid: mercantour1-1
+ 39:
+ uid: mercantour1-6
+ 40:
+ uid: mercantour1-5
+ 41:
+ uid: mercantour1-10
+ 42:
+ uid: mercantour1-9
+ 43:
+ uid: mercantour1-14
+ 44:
+ uid: mercantour1-13
+ 45:
+ uid: uvb-10
+ 46:
+ uid: uvb-9
+ 48:
+ uid: gw
+
+ channels:
+ lag1:
+ kind: server
+ rate: 500000000000
+ uid: srv-data1
+ port: lag1
+ lag2:
+ kind: server
+ rate: 500000000000
+ uid: srv-data2
+ port: lag2
+ lag3:
+ kind: server
+ rate: 500000000000
+ uid: srv-data3
+ port: lag3
+ lag4:
+ kind: server
+ rate: 200000000000
+ uid: srv-data4
+ port: lag4
--
GitLab
From a97bc8196f2486ba64c328e6289e82e8b4d4cf7e Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 10:52:16 +0100
Subject: [PATCH 2/7] [sophia][network] remove swx1nef and swy1nef
---
.../sites/sophia/network_equipments/gw.json | 6 -
.../sophia/network_equipments/swx1nef.json | 72 ------
.../sophia/network_equipments/swy1nef.json | 234 ------------------
.../sites/sophia/networks/gw-sophia.yaml | 4 -
.../sites/sophia/networks/swx1nef.yaml | 27 --
.../sites/sophia/networks/swy1nef.yaml | 21 --
6 files changed, 364 deletions(-)
delete mode 100644 data/grid5000/sites/sophia/network_equipments/swx1nef.json
delete mode 100644 data/grid5000/sites/sophia/network_equipments/swy1nef.json
delete mode 100644 input/grid5000/sites/sophia/networks/swx1nef.yaml
delete mode 100644 input/grid5000/sites/sophia/networks/swy1nef.yaml
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 45aa1db08b0..b3fa33cff85 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -19,12 +19,6 @@
"kind": "backbone",
"snmp_name": "10GigabitEthernet1/1",
"uid": "renater-sophia"
- },
- {
- "kind": "switch",
- "port": "0/5",
- "snmp_name": "10GigabitEthernet1/2",
- "uid": "swx1nef"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/swx1nef.json b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
deleted file mode 100644
index 09b92b311de..00000000000
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "backplane_bps": 240000000000,
- "kind": "switch",
- "linecards": [
- {
- "kind": "virtual",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "router",
- "port": "1/2",
- "snmp_name": "Port: 5 Gigabit",
- "uid": "gw"
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "switch",
- "port": "0/103",
- "snmp_name": "Port: 18 Gigabit",
- "uid": "swy1nef"
- },
- {
- "kind": "other",
- "port": "eth3",
- "snmp_name": "Port: 19 Gigabit",
- "uid": "srv3"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Port: %PORT% Gigabit"
- }
- ],
- "managed_by_us": true,
- "model": "Juniper EX2500-24F-FB",
- "site": "sophia",
- "snmp_community": "g5kadmin",
- "type": "network_equipment",
- "uid": "swx1nef",
- "warranty": "expired"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swy1nef.json b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
deleted file mode 100644
index 3190fc54f2f..00000000000
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
- "backplane_bps": 184000000000,
- "ip": "172.16.143.249",
- "kind": "switch",
- "linecards": [
- {
- "kavlan_pattern": "%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "switch",
- "port": "0/18",
- "snmp_name": "Port: 103 Gigabit",
- "uid": "swx1nef"
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "Port: %PORT% Gigabit"
- }
- ],
- "managed_by_us": true,
- "model": "Dell PowerConnect 6248",
- "site": "sophia",
- "snmp_community": "g5kadmin",
- "type": "network_equipment",
- "uid": "swy1nef",
- "warranty": "expired"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index e6775aae835..7c0f64d489d 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -136,10 +136,6 @@ gw:
1:
uid: renater-sophia
kind: backbone
- 2:
- uid: swx1nef
- kind: switch
- port: 0/5
3:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
deleted file mode 100644
index ee65099afc7..00000000000
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-swx1nef:
- model: Juniper EX2500-24F-FB
- warranty: expired
- kind: switch
- managed_by_us: true
- site: sophia
- snmp_community: g5kadmin
- backplane_bps: 240000000000
- linecards:
- 0:
- snmp_pattern: "Port: %PORT% Gigabit"
- kind: virtual
- rate: 10000000000
- ports:
- 5:
- uid: gw
- kind: router
- port: 1/2
- 18:
- uid: swy1nef
- kind: switch
- port: 0/103
- 19:
- uid: srv3
- kind: other
- port: eth3
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
deleted file mode 100644
index fa2f9097afd..00000000000
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-swy1nef:
- model: Dell PowerConnect 6248
- warranty: expired
- kind: switch
- managed_by_us: true
- site: sophia
- snmp_community: g5kadmin
- ip: 172.16.143.249
- backplane_bps: 184000000000
- linecards:
- 0:
- snmp_pattern: "Port: %PORT% Gigabit"
- kavlan_pattern: "%PORT%"
- kind: node
- rate: 1000000000
- ports:
- 103:
- uid: swx1nef
- kind: switch
- port: 0/18
--
GitLab
From 9334d4f0708c85e8c6d40d001479612225e59c4e Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 11:42:26 +0100
Subject: [PATCH 3/7] [sophia][network] fix link for sw-3
---
input/grid5000/sites/sophia/networks/sw-3.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 8af86aca18d..4453d27ceb9 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -71,8 +71,8 @@ sw-1:
46:
uid: uvb-9
48:
- uid: gw
-
+ uid: gw-ng
+ kind: switch
channels:
lag1:
kind: server
--
GitLab
From 7fec9c41059605045644d1588550626bcde4615b Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 11:57:42 +0100
Subject: [PATCH 4/7] [sophia][servers] fix ip for adm interface of
kadeploy-devel
---
data/grid5000/sites/sophia/servers/kadeploy-devel.json | 2 +-
input/grid5000/sites/sophia/servers/virtual.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/servers/kadeploy-devel.json b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
index 1ebf36bd8ac..f75d143d8a6 100644
--- a/data/grid5000/sites/sophia/servers/kadeploy-devel.json
+++ b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
@@ -2,7 +2,7 @@
"kind": "virtual",
"network_adapters": {
"adm": {
- "ip": "172.17.143.105"
+ "ip": "172.17.143.127"
},
"default": {
"ip": "172.16.143.127"
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index f0692b07fdb..4236b363398 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -66,7 +66,7 @@ kadeploy-devel:
default:
ip: 172.16.143.127
adm:
- ip: 172.17.143.105
+ ip: 172.17.143.127
kavlan:
kind: virtual
alias:
--
GitLab
From fda58145936dad4d7c19d389f45b2520f8f667ce Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 12:13:15 +0100
Subject: [PATCH 5/7] [sophia] regenerate JSON files for nodes
---
.../mercantour2/nodes/mercantour2-1.json | 4 +-
.../mercantour2/nodes/mercantour2-2.json | 4 +-
.../mercantour2/nodes/mercantour2-3.json | 4 +-
.../mercantour2/nodes/mercantour2-4.json | 4 +-
.../mercantour2/nodes/mercantour2-5.json | 4 +-
.../mercantour2/nodes/mercantour2-6.json | 4 +-
.../mercantour2/nodes/mercantour2-7.json | 4 +-
.../mercantour2/nodes/mercantour2-8.json | 4 +-
.../sophia/clusters/musa/nodes/musa-3.json | 4 +-
.../sophia/clusters/musa/nodes/musa-4.json | 4 +-
.../sophia/clusters/musa/nodes/musa-5.json | 4 +-
.../sophia/clusters/musa/nodes/musa-6.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-10.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-11.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-12.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-9.json | 4 +-
.../sites/sophia/network_equipments/sw-1.json | 99 ++++++++++++++++---
17 files changed, 115 insertions(+), 48 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
index 6a05ce5071a..e18b6e0c745 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/34",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
index 2333e315f39..71769e2777d 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/33",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index 56631211c59..ce0c520f7e7 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 7719126b438..747d7fd4ce2 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
index 090ed556682..6326ca251cf 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/36",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
index 1dd5d346fb4..4ffd23bc127 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/35",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 95379a33754..d59edcc4dcf 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/11",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 621916cb05e..207ebb6fb1e 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -131,8 +131,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/12",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index b48ed359cdd..8aefc2a4fad 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
- "switch_port": "1/1/33",
+ "switch": null,
+ "switch_port": null,
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index b67a523d22c..c7d8ef7de9f 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
- "switch_port": "1/1/34",
+ "switch": null,
+ "switch_port": null,
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index a075db444f0..93b435cbd6d 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
- "switch_port": "1/1/35",
+ "switch": null,
+ "switch_port": null,
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index b5ac1184b4e..c5bbe22d161 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-1",
- "switch_port": "1/1/36",
+ "switch": null,
+ "switch_port": null,
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 2572a63083c..55f28806f47 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/45",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index f94b6a4db95..bfdd2543ecd 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index 3daed83a644..4f4146ba712 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/2",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index d55f23219f9..de668adcc28 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -156,8 +156,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/46",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-1.json b/data/grid5000/sites/sophia/network_equipments/sw-1.json
index 9f068318a8a..73865abef47 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-1.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-1.json
@@ -26,7 +26,7 @@
"uid": "srv-data4"
}
},
- "ip": "172.17.143.251",
+ "ip": "172.17.143.247",
"kind": "switch",
"linecards": [
{
@@ -38,51 +38,83 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/1",
+ "uid": "uvb-11"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/2",
+ "uid": "uvb-12"
},
{
"kind": "channel",
"snmp_name": "1/1/3",
- "uid": "lag1"
+ "uid": "mercantour1-15"
},
{
"kind": "channel",
"snmp_name": "1/1/4",
- "uid": "lag1"
+ "uid": "mercantour1-16"
},
{
"kind": "channel",
"rate": 25000000000,
"snmp_name": "1/1/5",
- "uid": "lag2"
+ "uid": "mercantour1-11"
},
{
"kind": "channel",
"snmp_name": "1/1/6",
- "uid": "lag2"
+ "uid": "mercantour1-12"
},
{
"kind": "channel",
"snmp_name": "1/1/7",
- "uid": "lag3"
+ "uid": "mercantour1-7"
},
{
"kind": "channel",
"snmp_name": "1/1/8",
- "uid": "lag3"
+ "uid": "mercantour1-8"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/9",
+ "uid": "mercantour1-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/10",
+ "uid": "mercantour1-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/11",
+ "uid": "mercantour2-7"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/12",
+ "uid": "mercantour2-8"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/13",
+ "uid": "mercantour2-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/14",
+ "uid": "mercantour2-4"
},
{
},
@@ -132,65 +164,100 @@
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/33",
- "uid": "musa-3"
+ "uid": "mercantour2-2"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/34",
- "uid": "musa-4"
+ "uid": "mercantour2-1"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/35",
- "uid": "musa-5"
+ "uid": "mercantour2-6"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/36",
- "uid": "musa-6"
+ "uid": "mercantour2-5"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/37",
+ "uid": "mercantour1-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/38",
+ "uid": "mercantour1-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/39",
+ "uid": "mercantour1-6"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/40",
- "uid": "lag4"
+ "uid": "mercantour1-5"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/41",
- "uid": "lag4"
+ "uid": "mercantour1-10"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/42",
+ "uid": "mercantour1-9"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/43",
+ "uid": "mercantour1-14"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/44",
+ "uid": "mercantour1-13"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/45",
+ "uid": "uvb-10"
},
{
"kind": "router",
"rate": 10000000000,
"snmp_name": "1/1/46",
- "uid": "gw"
+ "uid": "uvb-9"
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/48",
+ "uid": "gw-ng"
}
],
- "rate": 25000000000,
+ "rate": 1000000000,
"snmp_pattern": "%LINECARD%/1/%PORT%"
}
],
"managed_by_us": true,
- "model": "Aruba 8325-48Y8C",
+ "model": "Aruba 6300M",
"site": "sophia",
"snmp_community": "public",
"type": "network_equipment",
--
GitLab
From c049d86c6c915d7e53f51760ef51e791183ecbae Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 11:59:00 +0100
Subject: [PATCH 6/7] [sophia][network] fix ip for gw-ng
---
.../sophia/network_equipments/gw-ng.json | 153 ++++++++++++++++++
.../grid5000/sites/sophia/networks/gw-ng.yaml | 43 +++++
2 files changed, 196 insertions(+)
create mode 100644 data/grid5000/sites/sophia/network_equipments/gw-ng.json
create mode 100644 input/grid5000/sites/sophia/networks/gw-ng.yaml
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-ng.json b/data/grid5000/sites/sophia/network_equipments/gw-ng.json
new file mode 100644
index 00000000000..2002688fee1
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/gw-ng.json
@@ -0,0 +1,153 @@
+{
+ "channels": {
+ "lag1": {
+ "kind": "server",
+ "port": "lag1",
+ "rate": 500000000000,
+ "uid": "srv-data1"
+ },
+ "lag2": {
+ "kind": "server",
+ "port": "lag2",
+ "rate": 500000000000,
+ "uid": "srv-data2"
+ },
+ "lag3": {
+ "kind": "server",
+ "port": "lag3",
+ "rate": 500000000000,
+ "uid": "srv-data3"
+ },
+ "lag4": {
+ "kind": "server",
+ "port": "lag4",
+ "rate": 200000000000,
+ "uid": "srv-data4"
+ }
+ },
+ "ip": "172.17.143.253",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/47",
+ "uid": "sw-3"
+ },
+ {
+ "kind": "router",
+ "snmp_name": "1/1/48",
+ "uid": "gw"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 6300M",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "gw-ng",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/gw-ng.yaml b/input/grid5000/sites/sophia/networks/gw-ng.yaml
new file mode 100644
index 00000000000..3b9f1302c91
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/gw-ng.yaml
@@ -0,0 +1,43 @@
+---
+gw-ng:
+ model: Aruba 6300M
+ warranty: 2048-05
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.253
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 47:
+ uid: sw-3
+ kind: switch
+ 48:
+ uid: gw
+ kind: router
+ channels:
+ lag1:
+ kind: server
+ rate: 500000000000
+ uid: srv-data1
+ port: lag1
+ lag2:
+ kind: server
+ rate: 500000000000
+ uid: srv-data2
+ port: lag2
+ lag3:
+ kind: server
+ rate: 500000000000
+ uid: srv-data3
+ port: lag3
+ lag4:
+ kind: server
+ rate: 200000000000
+ uid: srv-data4
+ port: lag4
--
GitLab
From eb7d278529c4f4f16eed3a48f6c7ddb98526d45d Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 23 Jan 2025 12:25:37 +0100
Subject: [PATCH 7/7] [sophia][network] regenerate node conf with switch
---
.../mercantour2/nodes/mercantour2-1.json | 2 +-
.../mercantour2/nodes/mercantour2-2.json | 2 +-
.../mercantour2/nodes/mercantour2-3.json | 2 +-
.../mercantour2/nodes/mercantour2-4.json | 2 +-
.../mercantour2/nodes/mercantour2-5.json | 2 +-
.../mercantour2/nodes/mercantour2-6.json | 2 +-
.../mercantour2/nodes/mercantour2-7.json | 2 +-
.../mercantour2/nodes/mercantour2-8.json | 2 +-
.../sophia/clusters/musa/nodes/musa-3.json | 4 +-
.../sophia/clusters/musa/nodes/musa-4.json | 4 +-
.../sophia/clusters/musa/nodes/musa-5.json | 4 +-
.../sophia/clusters/musa/nodes/musa-6.json | 4 +-
.../sophia/clusters/uvb/nodes/uvb-10.json | 2 +-
.../sophia/clusters/uvb/nodes/uvb-11.json | 2 +-
.../sophia/clusters/uvb/nodes/uvb-12.json | 2 +-
.../sophia/clusters/uvb/nodes/uvb-9.json | 2 +-
.../sites/sophia/network_equipments/gw.json | 3 +
.../sites/sophia/network_equipments/sw-1.json | 99 ++-----
.../sites/sophia/network_equipments/sw-3.json | 262 ++++++++++++++++++
.../sites/sophia/networks/gw-sophia.yaml | 3 +
.../grid5000/sites/sophia/networks/sw-3.yaml | 2 +-
21 files changed, 305 insertions(+), 104 deletions(-)
create mode 100644 data/grid5000/sites/sophia/network_equipments/sw-3.json
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
index e18b6e0c745..1dfa242f1a5 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/34",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
index 71769e2777d..f95526b4512 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/33",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index ce0c520f7e7..6f4361b6dd0 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 747d7fd4ce2..3de7706dc5a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
index 6326ca251cf..feaad548f20 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/36",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
index 4ffd23bc127..38913a8da6b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index d59edcc4dcf..3d01c5f739b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 207ebb6fb1e..236af42fdc3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -131,7 +131,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/12",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index 8aefc2a4fad..b48ed359cdd 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/33",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index c7d8ef7de9f..b67a523d22c 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/34",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 93b435cbd6d..a075db444f0 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/35",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index c5bbe22d161..b5ac1184b4e 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -168,8 +168,8 @@
"rate": 25000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-1",
+ "switch_port": "1/1/36",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 55f28806f47..888de235851 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -156,7 +156,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index bfdd2543ecd..e8589026ea8 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -156,7 +156,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index 4f4146ba712..807227ee028 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -156,7 +156,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/2",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index de668adcc28..7a9e4303258 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -156,7 +156,7 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 7,
- "switch": "sw-1",
+ "switch": "sw-3",
"switch_port": "1/1/46",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index b3fa33cff85..d2f1ca59810 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -219,6 +219,9 @@
{
},
{
+ "kind": "switch",
+ "snmp_name": "GigabitEthernet9/7",
+ "uid": "gw-ng"
},
{
},
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-1.json b/data/grid5000/sites/sophia/network_equipments/sw-1.json
index 73865abef47..9f068318a8a 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-1.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-1.json
@@ -26,7 +26,7 @@
"uid": "srv-data4"
}
},
- "ip": "172.17.143.247",
+ "ip": "172.17.143.251",
"kind": "switch",
"linecards": [
{
@@ -38,83 +38,51 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/1",
- "uid": "uvb-11"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/2",
- "uid": "uvb-12"
},
{
"kind": "channel",
"snmp_name": "1/1/3",
- "uid": "mercantour1-15"
+ "uid": "lag1"
},
{
"kind": "channel",
"snmp_name": "1/1/4",
- "uid": "mercantour1-16"
+ "uid": "lag1"
},
{
"kind": "channel",
"rate": 25000000000,
"snmp_name": "1/1/5",
- "uid": "mercantour1-11"
+ "uid": "lag2"
},
{
"kind": "channel",
"snmp_name": "1/1/6",
- "uid": "mercantour1-12"
+ "uid": "lag2"
},
{
"kind": "channel",
"snmp_name": "1/1/7",
- "uid": "mercantour1-7"
+ "uid": "lag3"
},
{
"kind": "channel",
"snmp_name": "1/1/8",
- "uid": "mercantour1-8"
+ "uid": "lag3"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/9",
- "uid": "mercantour1-3"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/10",
- "uid": "mercantour1-4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/11",
- "uid": "mercantour2-7"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/12",
- "uid": "mercantour2-8"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/13",
- "uid": "mercantour2-3"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/14",
- "uid": "mercantour2-4"
},
{
},
@@ -164,100 +132,65 @@
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/33",
- "uid": "mercantour2-2"
+ "uid": "musa-3"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/34",
- "uid": "mercantour2-1"
+ "uid": "musa-4"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/35",
- "uid": "mercantour2-6"
+ "uid": "musa-5"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "1/1/36",
- "uid": "mercantour2-5"
+ "uid": "musa-6"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/37",
- "uid": "mercantour1-2"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/38",
- "uid": "mercantour1-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/39",
- "uid": "mercantour1-6"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/40",
- "uid": "mercantour1-5"
+ "uid": "lag4"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/41",
- "uid": "mercantour1-10"
+ "uid": "lag4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/42",
- "uid": "mercantour1-9"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/43",
- "uid": "mercantour1-14"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/44",
- "uid": "mercantour1-13"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/45",
- "uid": "uvb-10"
},
{
"kind": "router",
"rate": 10000000000,
"snmp_name": "1/1/46",
- "uid": "uvb-9"
- },
- {
- },
- {
- "kind": "switch",
- "snmp_name": "1/1/48",
- "uid": "gw-ng"
+ "uid": "gw"
}
],
- "rate": 1000000000,
+ "rate": 25000000000,
"snmp_pattern": "%LINECARD%/1/%PORT%"
}
],
"managed_by_us": true,
- "model": "Aruba 6300M",
+ "model": "Aruba 8325-48Y8C",
"site": "sophia",
"snmp_community": "public",
"type": "network_equipment",
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
new file mode 100644
index 00000000000..75db0f68c78
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -0,0 +1,262 @@
+{
+ "channels": {
+ "lag1": {
+ "kind": "server",
+ "port": "lag1",
+ "rate": 500000000000,
+ "uid": "srv-data1"
+ },
+ "lag2": {
+ "kind": "server",
+ "port": "lag2",
+ "rate": 500000000000,
+ "uid": "srv-data2"
+ },
+ "lag3": {
+ "kind": "server",
+ "port": "lag3",
+ "rate": 500000000000,
+ "uid": "srv-data3"
+ },
+ "lag4": {
+ "kind": "server",
+ "port": "lag4",
+ "rate": 200000000000,
+ "uid": "srv-data4"
+ }
+ },
+ "ip": "172.17.143.247",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/1",
+ "uid": "uvb-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/2",
+ "uid": "uvb-12"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/3",
+ "uid": "mercantour1-15"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/4",
+ "uid": "mercantour1-16"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/5",
+ "uid": "mercantour1-11"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/6",
+ "uid": "mercantour1-12"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/7",
+ "uid": "mercantour1-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/8",
+ "uid": "mercantour1-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/9",
+ "uid": "mercantour1-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/10",
+ "uid": "mercantour1-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/11",
+ "uid": "mercantour2-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/12",
+ "uid": "mercantour2-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/13",
+ "uid": "mercantour2-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/14",
+ "uid": "mercantour2-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/33",
+ "uid": "mercantour2-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/34",
+ "uid": "mercantour2-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/35",
+ "uid": "mercantour2-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/36",
+ "uid": "mercantour2-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/37",
+ "uid": "mercantour1-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/38",
+ "uid": "mercantour1-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/39",
+ "uid": "mercantour1-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/40",
+ "uid": "mercantour1-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/41",
+ "uid": "mercantour1-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/42",
+ "uid": "mercantour1-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/43",
+ "uid": "mercantour1-14"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/44",
+ "uid": "mercantour1-13"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/45",
+ "uid": "uvb-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/46",
+ "uid": "uvb-9"
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/48",
+ "uid": "gw-ng"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 6300M",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-3",
+ "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 7c0f64d489d..3c83b0c4994 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -202,6 +202,9 @@ gw:
2:
uid: srv-data
kind: server
+ 7:
+ uid: gw-ng
+ kind: switch
9:
uid: sw-1
kind: switch
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 4453d27ceb9..61760909d6c 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -1,5 +1,5 @@
---
-sw-1:
+sw-3:
model: Aruba 6300M
warranty: 2048-05
kind: switch
--
GitLab