diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json index 9587f52b1fbfef2940ea26cfe9a497ed639977fb..da39c9e0c6074520abb49679ae0e4ebc9382b9a0 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw.json +++ b/data/grid5000/sites/nancy/network_equipments/gw.json @@ -20,7 +20,7 @@ "port-channel4": { "kind": "switch", "port": "port-channel1", - "rate": 1000000000000, + "rate": 800000000000, "uid": "sgrappe" } }, @@ -1498,6 +1498,22 @@ "port": "eth3", "snmp_name": "Ethernet5/48", "uid": "grimoire-8" + }, + { + }, + { + }, + { + "kind": "channel", + "rate": 40000000000, + "snmp_name": "Ethernet5/51", + "uid": "port-channel4" + }, + { + "kind": "channel", + "rate": 40000000000, + "snmp_name": "Ethernet5/52", + "uid": "port-channel4" } ], "rate": 10000000000, diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json index 260bd21c36b137966c476958015cc29ee7edfa6e..0f9ca66487e5ea0823d534958e9964c59f6a6a69 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json +++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json @@ -1,9 +1,10 @@ { + "backplane_bps": 2160000000000, "channels": { "port-channel1": { "kind": "router", "port": "port-channel4", - "rate": 1000000000000, + "rate": 800000000000, "uid": "gw" } }, @@ -13,7 +14,7 @@ { }, { - "kavlan_pattern": "Ethernet%LINECARD%/%PORT%", + "kavlan_pattern": "Ethernet1%LINECARD%/%PORT%", "kind": "node", "ports": [ { diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json index b122e55233e138fb406abdc0771ece6a7905ef18..e6780b89668abc13eecdba6a34d463dce5b3eaa8 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgros1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json @@ -1,5 +1,5 @@ { - "backplane_bps": 6400000000000, + "backplane_bps": 12800000000000, "channels": { "port-channel1": { "kind": "router", diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json index 88050be1a188542c4a826188b3304739df8d106a..9c1cac20d07af3028a7bf44838568472fc762a61 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgros2.json +++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json @@ -1,5 +1,5 @@ { - "backplane_bps": 6400000000000, + "backplane_bps": 12800000000000, "channels": { "port-channel1": { "kind": "router", diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml index 7db7d8e074610fc6fef96de7b1bfcfaf2c7c2606..dd6c135c58de336fd35546b62baef702dfc47ecc 100644 --- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml +++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml @@ -609,6 +609,15 @@ gw: uid: grimoire-7-eth3 48: uid: grimoire-8-eth3 + 51: + uid: port-channel4 + kind: channel + rate: 40_000_000_000 + 52: + uid: port-channel4 + kind: channel + rate: 40_000_000_000 + 6: snmp_pattern: "Ethernet%LINECARD%/%PORT%" kavlan_pattern: "Ethernet%LINECARD%/%PORT%" @@ -805,5 +814,5 @@ gw: port: port-channel1 uid: sgrappe kind: switch - rate: 1000000000000 + rate: 800000000000 diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml index a21baa46bae9f26639ffe380b410162ed4a8c084..e55cc334b6ace9f6deb2c3bf58fbc23e40fb2b67 100644 --- a/input/grid5000/sites/nancy/networks/sgrappe.yaml +++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml @@ -7,10 +7,11 @@ sgrappe: site: nancy snmp_community: public ip: 172.17.79.205 + backplane_bps: 2160000000000 linecards: 1: snmp_pattern: "Ethernet1/%LINECARD%/%PORT%" - kavlan_pattern: "Ethernet%LINECARD%/%PORT%" + kavlan_pattern: "Ethernet1%LINECARD%/%PORT%" kind: node rate: 25000000000 ports: @@ -57,4 +58,4 @@ sgrappe: port: port-channel4 uid: gw kind: router - rate: 1000000000000 + rate: 800000000000 diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml index b266cd92252c734c8137e28b8a6a4f95e3562dc7..f5544fde248d60b08a4db9f700355c96cade800a 100644 --- a/input/grid5000/sites/nancy/networks/sgros1.yaml +++ b/input/grid5000/sites/nancy/networks/sgros1.yaml @@ -7,7 +7,7 @@ sgros1: site: nancy snmp_community: public ip: 172.17.79.208 - backplane_bps: 6400000000000 + backplane_bps: 12800000000000 metrics: - name: network_ifacein_bytes_total description: Input byte counter for the network device port diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml index 26f143e526a57e5bba649e9d72c7ac87c139d101..17b686734297c3befcdcfe950d17937d7cc9d7c5 100644 --- a/input/grid5000/sites/nancy/networks/sgros2.yaml +++ b/input/grid5000/sites/nancy/networks/sgros2.yaml @@ -20,7 +20,7 @@ sgros2: protocol: snmp id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }} ip: 172.17.79.209 - backplane_bps: 6400000000000 + backplane_bps: 12800000000000 linecards: 1: snmp_pattern: "ethernet1/1/%PORT%:1"