From 936c4ec4b5d9a8a85a0d2cd697465d28835f26c9 Mon Sep 17 00:00:00 2001 From: Matthieu Imbert <matthieu.imbert@inria.fr> Date: Tue, 9 Jul 2024 09:49:46 +0200 Subject: [PATCH] [rennes, toulouse] fix aruba trunks naming lagX -> lag X --- .../sites/rennes/network_equipments/gw.json | 30 +++++++++---------- .../sites/rennes/network_equipments/sw-1.json | 8 ++--- .../network_equipments/swcore-01-rba.json | 2 +- .../sites/toulouse/network_equipments/gw.json | 12 ++++---- .../network_equipments/sw-estats.json | 2 +- .../sites/rennes/networks/gw-rennes.yaml | 30 +++++++++---------- .../grid5000/sites/rennes/networks/sw-1.yaml | 8 ++--- .../sites/rennes/networks/swcore-01-rba.yaml | 2 +- .../grid5000/sites/toulouse/networks/gw.yaml | 12 ++++---- .../sites/toulouse/networks/sw-estats.yaml | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json index 3ecebcf5163..31c40e1eb26 100644 --- a/data/grid5000/sites/rennes/network_equipments/gw.json +++ b/data/grid5000/sites/rennes/network_equipments/gw.json @@ -4,27 +4,27 @@ ], "backplane_bps": 1440000000000, "channels": { - "lag1": { + "lag 1": { "kind": "switch", - "port": "lag1", + "port": "lag 1", "rate": 200000000000, "uid": "sw-1" }, - "lag2": { + "lag 2": { "kind": "server", - "port": "lag2", + "port": "lag 2", "rate": 50000000000, "uid": "srv-data" }, - "lag3": { + "lag 3": { "kind": "switch", "port": "port-channel286", "rate": 20000000000, "uid": "swcore-01-rba" }, - "lag4": { + "lag 4": { "kind": "server", - "port": "lag4", + "port": "lag 4", "rate": 50000000000, "uid": "srv-data2" } @@ -99,12 +99,12 @@ { "kind": "channel", "snmp_name": "1/1/29", - "uid": "lag4" + "uid": "lag 4" }, { "kind": "channel", "snmp_name": "1/1/30", - "uid": "lag4" + "uid": "lag 4" }, { "kind": "server", @@ -126,12 +126,12 @@ { "kind": "channel", "snmp_name": "1/1/35", - "uid": "lag2" + "uid": "lag 2" }, { "kind": "channel", "snmp_name": "1/1/36", - "uid": "lag2" + "uid": "lag 2" }, { }, @@ -173,25 +173,25 @@ "kind": "channel", "rate": 10000000000, "snmp_name": "1/1/47", - "uid": "lag3" + "uid": "lag 3" }, { "kind": "channel", "rate": 10000000000, "snmp_name": "1/1/48", - "uid": "lag3" + "uid": "lag 3" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/49", - "uid": "lag1" + "uid": "lag 1" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/50", - "uid": "lag1" + "uid": "lag 1" } ], "rate": 25000000000, diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1.json b/data/grid5000/sites/rennes/network_equipments/sw-1.json index d41cab7ba80..d3e20c4ad25 100644 --- a/data/grid5000/sites/rennes/network_equipments/sw-1.json +++ b/data/grid5000/sites/rennes/network_equipments/sw-1.json @@ -1,9 +1,9 @@ { "backplane_bps": 1440000000000, "channels": { - "lag1": { + "lag 1": { "kind": "switch", - "port": "lag1", + "port": "lag 1", "rate": 200000000000, "uid": "gw" } @@ -247,13 +247,13 @@ "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/49", - "uid": "lag1" + "uid": "lag 1" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/50", - "uid": "lag1" + "uid": "lag 1" } ], "rate": 25000000000, diff --git a/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json b/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json index 400c54178ec..da9e652d2d5 100644 --- a/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json +++ b/data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json @@ -2,7 +2,7 @@ "channels": { "port-channel286": { "kind": "router", - "port": "lag3", + "port": "lag 3", "rate": 20000000000, "uid": "gw" }, diff --git a/data/grid5000/sites/toulouse/network_equipments/gw.json b/data/grid5000/sites/toulouse/network_equipments/gw.json index a275d22424b..9d61d806337 100644 --- a/data/grid5000/sites/toulouse/network_equipments/gw.json +++ b/data/grid5000/sites/toulouse/network_equipments/gw.json @@ -3,13 +3,13 @@ "gw-toulouse" ], "channels": { - "lag1": { + "lag 1": { "kind": "server", "port": "port-channel1", "rate": 20000000000, "uid": "nfs" }, - "lag2": { + "lag 2": { "kind": "switch", "port": "lacp key 1", "rate": 20000000000, @@ -99,12 +99,12 @@ { "kind": "channel", "snmp_name": "1/1/15", - "uid": "lag2" + "uid": "lag 2" }, { "kind": "channel", "snmp_name": "1/1/16", - "uid": "lag2" + "uid": "lag 2" }, { "kind": "server", @@ -119,12 +119,12 @@ { "kind": "channel", "snmp_name": "1/1/19", - "uid": "lag1" + "uid": "lag 1" }, { "kind": "channel", "snmp_name": "1/1/20", - "uid": "lag1" + "uid": "lag 1" } ], "rate": 10000000000, diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json index 0d9d0a59104..a05ab575cb1 100644 --- a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json +++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json @@ -5,7 +5,7 @@ "channels": { "lacp key 1": { "kind": "router", - "port": "lag2", + "port": "lag 2", "rate": 20000000000, "uid": "gw" } diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml index f5405ae6dd5..d2e87d570a4 100644 --- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml +++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml @@ -70,10 +70,10 @@ gw: rate: 25000000000 ports: 29: - uid: lag4 + uid: lag 4 kind: channel 30: - uid: lag4 + uid: lag 4 kind: channel 31: uid: srv-1 @@ -85,10 +85,10 @@ gw: uid: srv-3 kind: server 35: - uid: lag2 + uid: lag 2 kind: channel 36: - uid: lag2 + uid: lag 2 kind: channel 43: uid: sw-adm-1 @@ -107,39 +107,39 @@ gw: kind: backbone rate: 10000000000 47: - uid: lag3 + uid: lag 3 kind: channel rate: 10000000000 48: - uid: lag3 + uid: lag 3 kind: channel rate: 10000000000 49: - uid: lag1 + uid: lag 1 kind: channel rate: 100000000000 50: - uid: lag1 + uid: lag 1 kind: channel rate: 100000000000 channels: - lag1: + lag 1: kind: switch rate: 200000000000 uid: sw-1 - port: lag1 - lag2: + port: lag 1 + lag 2: kind: server rate: 50000000000 uid: srv-data - port: lag2 - lag3: + port: lag 2 + lag 3: kind: switch rate: 20000000000 uid: swcore-01-rba port: port-channel286 - lag4: + lag 4: kind: server rate: 50000000000 uid: srv-data2 - port: lag4 + port: lag 4 diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml index defd51c5cdd..5eec6ef290a 100644 --- a/input/grid5000/sites/rennes/networks/sw-1.yaml +++ b/input/grid5000/sites/rennes/networks/sw-1.yaml @@ -80,16 +80,16 @@ sw-1: 32: uid: paradoxe-32 49: - uid: lag1 + uid: lag 1 kind: channel rate: 100000000000 50: - uid: lag1 + uid: lag 1 kind: channel rate: 100000000000 channels: - lag1: + lag 1: kind: switch rate: 200000000000 uid: gw - port: lag1 + port: lag 1 diff --git a/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml b/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml index 2aea7f2d408..ca49c4c379b 100644 --- a/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml +++ b/input/grid5000/sites/rennes/networks/swcore-01-rba.yaml @@ -51,5 +51,5 @@ swcore-01-rba: port-channel286: uid: gw kind: router - port: lag3 + port: lag 3 rate: 20000000000 diff --git a/input/grid5000/sites/toulouse/networks/gw.yaml b/input/grid5000/sites/toulouse/networks/gw.yaml index c8b2280fd35..223b052ad84 100644 --- a/input/grid5000/sites/toulouse/networks/gw.yaml +++ b/input/grid5000/sites/toulouse/networks/gw.yaml @@ -79,10 +79,10 @@ gw: 9: montcalm-9 10: montcalm-10 15: - uid: lag2 + uid: lag 2 kind: channel 16: - uid: lag2 + uid: lag 2 kind: channel 17: uid: pve-1 @@ -91,18 +91,18 @@ gw: uid: pve-2 kind: server 19: - uid: lag1 + uid: lag 1 kind: channel 20: - uid: lag1 + uid: lag 1 kind: channel channels: - lag1: + lag 1: uid: nfs kind: server rate: 20000000000 port: port-channel1 - lag2: + lag 2: uid: sw-estats kind: switch rate: 20000000000 diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml index 1d3d28c1c44..298870592cb 100644 --- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml +++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml @@ -43,4 +43,4 @@ sw-estats: uid: gw kind: router rate: 20000000000 - port: lag2 + port: lag 2 -- GitLab