diff --git a/data/grid5000/sites/toulouse/network_equipments/gw.json b/data/grid5000/sites/toulouse/network_equipments/gw.json index aff057009bf964f29ba412637bc984d73f230818..888fca10c2605d43eccb708b2936af1862833cd9 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": { - "port-channel1": { + "lag1": { "kind": "server", "port": "port-channel1", "rate": 20000000000, "uid": "nfs" }, - "port-channel2": { + "lag2": { "kind": "switch", "port": "port-channel1", "rate": 20000000000, @@ -98,12 +98,12 @@ { "kind": "channel", "snmp_name": "1/1/15", - "uid": "port-channel2" + "uid": "lag2" }, { "kind": "channel", "snmp_name": "1/1/16", - "uid": "port-channel2" + "uid": "lag2" }, { "kind": "server", @@ -118,12 +118,12 @@ { "kind": "channel", "snmp_name": "1/1/19", - "uid": "port-channel1" + "uid": "lag1" }, { "kind": "channel", "snmp_name": "1/1/20", - "uid": "port-channel1" + "uid": "lag1" } ], "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 ba0325818188384e2134d7314c45080618fbd5c1..a97cb0fe4787bebc2ed56004b8867951396845e0 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": { "port-channel1": { "kind": "router", - "port": "port-channel2", + "port": "lag2", "rate": 20000000000, "uid": "gw" } diff --git a/input/grid5000/sites/toulouse/networks/gw.yaml b/input/grid5000/sites/toulouse/networks/gw.yaml index 8f218e9836d865dd19453a371456f1dc10e3c2f2..867601d3d1e4477731852cb4ab2a7e17abcf4c34 100644 --- a/input/grid5000/sites/toulouse/networks/gw.yaml +++ b/input/grid5000/sites/toulouse/networks/gw.yaml @@ -81,10 +81,10 @@ gw: uid: montcalm-10 kind: server 15: - uid: port-channel2 + uid: lag2 kind: channel 16: - uid: port-channel2 + uid: lag2 kind: channel 17: uid: pve-1 @@ -93,18 +93,18 @@ gw: uid: pve-2 kind: server 19: - uid: port-channel1 + uid: lag1 kind: channel 20: - uid: port-channel1 + uid: lag1 kind: channel channels: - port-channel1: + lag1: uid: nfs kind: server rate: 20000000000 port: port-channel1 - port-channel2: + lag2: 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 cc71d708903174e4ca3111f20e3ce9c1ad090985..f233825f5d351baa8d801679511d26253820adb9 100644 --- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml +++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml @@ -39,4 +39,4 @@ sw-estats: uid: gw kind: router rate: 20000000000 - port: port-channel2 + port: lag2