diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json index bd99915062b190137d6baaebe99ddec1d7f756a0..83e320685ab262b1d578928198549549484a0abe 100644 --- a/data/grid5000/sites/rennes/network_equipments/gw.json +++ b/data/grid5000/sites/rennes/network_equipments/gw.json @@ -4,19 +4,19 @@ ], "backplane_bps": 1440000000000, "channels": { - "port-channel1": { + "lag1": { "kind": "switch", - "port": "port-channel1", + "port": "lag1", "rate": 200000000000, "uid": "sw-1" }, - "port-channel2": { + "lag2": { "kind": "server", - "port": "port-channel2", + "port": "lag2", "rate": 50000000000, "uid": "srv-data" }, - "port-channel3": { + "lag3": { "kind": "switch", "port": "port-channel3", "rate": 20000000000, @@ -114,12 +114,12 @@ { "kind": "channel", "snmp_name": "1/1/35", - "uid": "port-channel2" + "uid": "lag2" }, { "kind": "channel", "snmp_name": "1/1/36", - "uid": "port-channel2" + "uid": "lag2" }, { }, @@ -153,25 +153,25 @@ "kind": "channel", "rate": 10000000000, "snmp_name": "1/1/47", - "uid": "port-channel3" + "uid": "lag3" }, { "kind": "channel", "rate": 10000000000, "snmp_name": "1/1/48", - "uid": "port-channel3" + "uid": "lag3" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/49", - "uid": "port-channel1" + "uid": "lag1" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/50", - "uid": "port-channel1" + "uid": "lag1" } ], "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 9a43061fc925aa4e4348da1437de9d8bc3b28aaf..ab52121268da01624343038d575492eb63dc3cf7 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": { - "port-channel1": { + "lag1": { "kind": "switch", - "port": "port-channel1", + "port": "lag1", "rate": 200000000000, "uid": "gw" } @@ -118,13 +118,13 @@ "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/49", - "uid": "port-channel1" + "uid": "lag1" }, { "kind": "channel", "rate": 100000000000, "snmp_name": "1/1/50", - "uid": "port-channel1" + "uid": "lag1" } ], "rate": 25000000000, diff --git a/data/grid5000/sites/rennes/network_equipments/vss-inria.json b/data/grid5000/sites/rennes/network_equipments/vss-inria.json index 7026e9969129d3cd155803555bed84c5ff8b45d0..8eba67cdb9e6f7dca59edb40370146d66dea7423 100644 --- a/data/grid5000/sites/rennes/network_equipments/vss-inria.json +++ b/data/grid5000/sites/rennes/network_equipments/vss-inria.json @@ -2,7 +2,7 @@ "channels": { "port-channel3": { "kind": "router", - "port": "port-channel3", + "port": "lag3", "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 2204eee70db87e9dd301685d2dc4b044ff09ccee..c21348e74b3f794ebfe8baf8a1abc8abe9e383a9 100644 --- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml +++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml @@ -79,10 +79,10 @@ gw: uid: srv-3 kind: server 35: - uid: port-channel2 + uid: lag2 kind: channel 36: - uid: port-channel2 + uid: lag2 kind: channel 45: uid: parasilo-sw-1 @@ -93,33 +93,33 @@ gw: kind: backbone rate: 10000000000 47: - uid: port-channel3 + uid: lag3 kind: channel rate: 10000000000 48: - uid: port-channel3 + uid: lag3 kind: channel rate: 10000000000 49: - uid: port-channel1 + uid: lag1 kind: channel rate: 100000000000 50: - uid: port-channel1 + uid: lag1 kind: channel rate: 100000000000 channels: - port-channel1: + lag1: kind: switch rate: 200000000000 uid: sw-1 - port: port-channel1 - port-channel2: + port: lag1 + lag2: kind: server rate: 50000000000 uid: srv-data - port: port-channel2 - port-channel3: + port: lag2 + lag3: kind: switch rate: 20000000000 uid: vss-inria diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml index 644e6718c244323b7751f0f3cd5abad231a0ec1a..a77b8c99484dc103789a248e2c038fa88e4b5e3c 100644 --- a/input/grid5000/sites/rennes/networks/sw-1.yaml +++ b/input/grid5000/sites/rennes/networks/sw-1.yaml @@ -15,16 +15,16 @@ sw-1: rate: 25000000000 ports: 49: - uid: port-channel1 + uid: lag1 kind: channel rate: 100000000000 50: - uid: port-channel1 + uid: lag1 kind: channel rate: 100000000000 channels: - port-channel1: + lag1: kind: switch rate: 200000000000 uid: gw - port: port-channel1 + port: lag1 diff --git a/input/grid5000/sites/rennes/networks/vss-inria.yaml b/input/grid5000/sites/rennes/networks/vss-inria.yaml index 84da752d2b3944283acb976f27dd5fd4f403e2ef..7ab78b90c76fb39343ebe9aff2bb1a1e8eea8d6c 100644 --- a/input/grid5000/sites/rennes/networks/vss-inria.yaml +++ b/input/grid5000/sites/rennes/networks/vss-inria.yaml @@ -27,5 +27,5 @@ vss-inria: port-channel3: uid: gw kind: router - port: port-channel3 + port: lag3 rate: 20000000000