diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json index fd06ac2d1bd9bbd8a8a3099d10df9c9d7f5bd01d..04cfa91dec1b079d474ef4db6bff2e59d4cca308 100644 --- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json +++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json @@ -2,6 +2,14 @@ "alias": [ "gw" ], + "channels": { + "port-channel2": { + "kind": "switch", + "port": "port-channel1", + "rate": 20000000000, + "uid": "sw-estats" + } + }, "ip": "172.17.127.254", "ip6": "2001:660:4406:900::ffff:ffff", "kind": "router", @@ -82,14 +90,14 @@ { }, { - "kind": "server", + "kind": "channel", "snmp_name": "1/1/15", - "uid": "oobm" + "uid": "port-channel2" }, { - "kind": "server", + "kind": "channel", "snmp_name": "1/1/16", - "uid": "oobm" + "uid": "port-channel2" }, { "kind": "server", diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json new file mode 100644 index 0000000000000000000000000000000000000000..54ee4a99453cd471a37d7305cb4f5d1458638923 --- /dev/null +++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json @@ -0,0 +1,39 @@ +{ + "alias": [ + "sw-uagx" + ], + "channels": { + "port-channel1": { + "kind": "router", + "port": "port-channel2", + "rate": 20000000000, + "uid": "gw-toulouse" + } + }, + "ip": "172.17.127.252", + "kind": "switch", + "linecards": [ + { + }, + { + "ports": [ + { + }, + { + "kind": "channel", + "uid": "port-channel1" + }, + { + "kind": "channel", + "uid": "port-channel1" + } + ] + } + ], + "model": "Connecttech XDG201", + "serial": "Unknown", + "site": "toulouse", + "snmp_community": "g5kadmin", + "type": "network_equipment", + "uid": "sw-estats" +} \ No newline at end of file diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml index 50504a2a82ffed2f96c7e25e428aa4696c641f40..85920e2b41b8d4f90e832e4dac808ebf4dbf60a7 100644 --- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml +++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml @@ -80,11 +80,11 @@ gw-toulouse: uid: montcalm-10 kind: server 15: - uid: oobm - kind: server + uid: port-channel2 + kind: channel 16: - uid: oobm - kind: server + uid: port-channel2 + kind: channel 17: uid: pve-1 kind: server @@ -97,3 +97,9 @@ gw-toulouse: 20: uid: nfs kind: server + channels: + port-channel2: + uid: sw-estats + kind: switch + rate: 20000000000 + port: port-channel1 diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml new file mode 100644 index 0000000000000000000000000000000000000000..f06e2d511d6067989dd9a875b7b5f239a4aa846c --- /dev/null +++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml @@ -0,0 +1,25 @@ +--- +sw-estats: + site: toulouse + snmp_community: g5kadmin + model: Connecttech XDG201 + serial: Unknown + alias: + - sw-uagx + ip: 172.17.127.252 + kind: switch + linecards: + 1: + ports: + 1: + uid: port-channel1 + kind: channel + 2: + uid: port-channel1 + kind: channel + channels: + port-channel1: + uid: gw-toulouse + kind: router + rate: 20000000000 + port: port-channel2