diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json index 8edfca1af93f7f85844dea5a3f38cc98f4c7ea3d..a1a76a3d9d11c7faa5a41fb702b5029a4a1819a0 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw.json @@ -31,7 +31,7 @@ }, "port-channel40": { "kind": "switch", - "port": "Po1", + "port": "port-channel1", "rate": 20000000000, "uid": "skinovis2-prod-01" }, @@ -341,8 +341,16 @@ "uid": "drac-12" }, { + "kind": "channel", + "rate": 10000000000, + "snmp_name": "ethernet1/1/49", + "uid": "port-channel40" }, { + "kind": "channel", + "rate": 10000000000, + "snmp_name": "ethernet1/1/50", + "uid": "port-channel40" }, { }, diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json index 20d36ef2040023afbc20e09e8a91fa298673ea35..b46a0c84fcc54781e6bab46448b34e5e6b11a490 100644 --- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json +++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json @@ -1,7 +1,7 @@ { "backplane_bps": 400000000000, "channels": { - "Po1": { + "port-channel1": { "kind": "router", "port": "port-channel40", "rate": 20000000000, @@ -192,12 +192,12 @@ { "kind": "channel", "snmp_name": "Ethernet1/83", - "uid": "Po1" + "uid": "port-channel1" }, { "kind": "channel", "snmp_name": "Ethernet1/84", - "uid": "Po1" + "uid": "port-channel1" }, { }, diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml index 8dcded0c08a988e45f26efabec05ab3cf33c2e53..6428071c1983e4dd819031d4a1d08f7fcedb1e22 100644 --- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml +++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml @@ -168,6 +168,16 @@ gw: 46: drac-10 47: drac-11 48: drac-12 + 49: + uid: port-channel40 + kind: channel + rate: 10_000_000_000 + snmp_pattern: "ethernet1/1/%PORT%" + 50: + uid: port-channel40 + kind: channel + rate: 10_000_000_000 + snmp_pattern: "ethernet1/1/%PORT%" 67: uid: port-channel50 kind: channel @@ -301,7 +311,7 @@ gw: rate: 20000000000 port-channel40: uid: skinovis2-prod-01 - port: Po1 + port: port-channel1 kind: switch rate: 20_000_000_000 port-channel100: diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml index 8eda0ec0572b46e113b9755671f2e5e38dfabfff..8b6bbe444179d43ca36670f7c13387f73fefbddc 100644 --- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml +++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml @@ -23,17 +23,17 @@ skinovis2-prod-01: rate: 1_000_000_000 trunk: false 83: - uid: Po1 + uid: port-channel1 kind: channel 84: - uid: Po1 + uid: port-channel1 kind: channel 107: uid: srv-data3 kind: server rate: 100_000_000_000 channels: - Po1: + port-channel1: kind: router rate: 20_000_000_000 uid: gw