diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json index ee6706f86d3e2084af8c2d7c32a0794bc0ba4b8e..88d9c9fc0042f5cba5f9b4feb688e37ac2a42984 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw.json +++ b/data/grid5000/sites/nancy/network_equipments/gw.json @@ -4,6 +4,20 @@ "sgravillon2" ], "backplane_bps": 1280000000000, + "channels": { + "port-channel2": { + "kind": "switch", + "port": "port-channel1", + "rate": 800000000000, + "uid": "sgros1" + }, + "port-channel3": { + "kind": "switch", + "port": "port-channel1", + "rate": 800000000000, + "uid": "sgros2" + } + }, "ip": "172.16.79.254", "kind": "router", "linecards": [ @@ -1782,12 +1796,16 @@ { }, { + "kind": "channel", + "rate": 40000000000, + "snmp_name": "Ethernet6/51", + "uid": "port-channel3" }, { - "kind": "switch", + "kind": "channel", "rate": 40000000000, "snmp_name": "Ethernet6/52", - "uid": "sgros2" + "uid": "port-channel3" } ], "rate": 10000000000, @@ -2002,12 +2020,16 @@ { }, { + "kind": "channel", + "rate": 40000000000, + "snmp_name": "Ethernet7/51", + "uid": "port-channel2" }, { - "kind": "switch", + "kind": "channel", "rate": 40000000000, "snmp_name": "Ethernet7/52", - "uid": "sgros1" + "uid": "port-channel2" } ], "rate": 10000000000, diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json index ffc9368516422540e00a73e6a5ee838d976510b7..4e1a91ccd59e410bf1e9f2812b3297255ee72725 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgros1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json @@ -1,5 +1,13 @@ { "backplane_bps": 6400000000000, + "channels": { + "port-channel1": { + "kind": "router", + "port": "port-channel2", + "rate": 80000000000, + "uid": "gw" + } + }, "ip": "172.17.79.208", "kind": "switch", "linecards": [ @@ -11,9 +19,14 @@ { }, { - "kind": "router", + "kind": "channel", "snmp_name": "ethernet1/1/1:1", - "uid": "gw" + "uid": "port-channel1" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/1:2", + "uid": "port-channel1" } ], "rate": 40000000000, diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json index 4184de735abd5814aad2ab0576376eeefdce5504..71170a9d53b3f2b3cb653eb931d47327c58e9101 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgros2.json +++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json @@ -1,5 +1,13 @@ { "backplane_bps": 6400000000000, + "channels": { + "port-channel1": { + "kind": "router", + "port": "port-channel3", + "rate": 80000000000, + "uid": "gw" + } + }, "ip": "172.17.79.209", "kind": "switch", "linecards": [ @@ -11,9 +19,14 @@ { }, { - "kind": "router", + "kind": "channel", "snmp_name": "ethernet1/1/1:1", - "uid": "gw" + "uid": "port-channel1" + }, + { + "kind": "channel", + "snmp_name": "ethernet1/1/1:2", + "uid": "port-channel1" } ], "rate": 40000000000, diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml index 34e8af45f996c1a2d3d9d68e9b377e08d04c7789..b418787ef418ad9e0cee988fe92acc177f78caa2 100644 --- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml +++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml @@ -702,9 +702,13 @@ gw: uid: grimani-2 48: uid: grimani-3 + 51: + uid: port-channel3 + kind: channel + rate: 40_000_000_000 52: - uid: sgros2 - kind: switch + uid: port-channel3 + kind: channel rate: 40_000_000_000 7: @@ -765,7 +769,22 @@ gw: uid: graffiti-9-eth2 48: uid: graffiti-4-eth2 + 51: + uid: port-channel2 + kind: channel + rate: 40_000_000_000 52: - uid: sgros1 - kind: switch + uid: port-channel2 + kind: channel rate: 40_000_000_000 + channels: + port-channel2: + port: port-channel1 + uid: sgros1 + kind: switch + rate: 800000000000 + port-channel3: + port: port-channel1 + uid: sgros2 + kind: switch + rate: 800000000000 diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml index 7fe9f59eb5984c3ecddd056ba74de8267bb5508a..6c8d5b6ff627bf074611197191684ca5ed5b9c20 100644 --- a/input/grid5000/sites/nancy/networks/sgros1.yaml +++ b/input/grid5000/sites/nancy/networks/sgros1.yaml @@ -15,8 +15,11 @@ sgros1: rate: 40_000_000_000 ports: 1: - uid: gw - kind: router + uid: port-channel1 + kind: channel + 2: + uid: port-channel1 + kind: channel 3: snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%" kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%" @@ -327,3 +330,9 @@ sgros1: 2: gros-2 3: gros-3 4: gros-4 + channels: + port-channel1: + port: port-channel2 + uid: gw + kind: router + rate: 80000000000 diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml index 441790ff75789378dbb45bcb1780cc53e6266877..2d09d51013a7f869958815b1999772dd68fc220d 100644 --- a/input/grid5000/sites/nancy/networks/sgros2.yaml +++ b/input/grid5000/sites/nancy/networks/sgros2.yaml @@ -15,8 +15,11 @@ sgros2: rate: 40_000_000_000 ports: 1: - uid: gw - kind: router + uid: port-channel1 + kind: channel + 2: + uid: port-channel1 + kind: channel 3: snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%" kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%" @@ -327,3 +330,9 @@ sgros2: 2: gros-2-eth1 3: gros-3-eth1 4: gros-4-eth1 + channels: + port-channel1: + port: port-channel3 + uid: gw + kind: router + rate: 80000000000