diff --git a/data/grid5000/sites/sophia/clusters/esterel24/esterel24.json b/data/grid5000/sites/sophia/clusters/esterel24/esterel24.json index 354759704c5a7c28e8470496f832fb29db480fea..d74b5a994bdcb2479e07b5f59a09e734af6697ff 100644 --- a/data/grid5000/sites/sophia/clusters/esterel24/esterel24.json +++ b/data/grid5000/sites/sophia/clusters/esterel24/esterel24.json @@ -80,7 +80,7 @@ ], "model": "Dell PowerEdge T640", "nodes_count": 1, - "nodes_description": "1 CPU Intel Xeon Gold 6240R, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", + "nodes_description": "1 CPU Intel Xeon Gold 6240R, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet", "priority": 197001, "queues": [ "admin", diff --git a/data/grid5000/sites/sophia/clusters/esterel24/nodes/esterel24-1.json b/data/grid5000/sites/sophia/clusters/esterel24/nodes/esterel24-1.json index 502658dba4a6c441bcf6244eeae762bb04e0e2ca..bdd7d799b2bbcd4fe63c894e8118d7541651ea18 100644 --- a/data/grid5000/sites/sophia/clusters/esterel24/nodes/esterel24-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel24/nodes/esterel24-1.json @@ -50,9 +50,9 @@ "mounted": true, "name": "enp1s0f0np0", "network_address": "esterel24-1.sophia.grid5000.fr", - "rate": 10000000000, - "switch": null, - "switch_port": null + "rate": 1000000000, + "switch": "sw-5", + "switch_port": "1/1/1" }, { "device": "bmc", diff --git a/data/grid5000/sites/sophia/network_equipments/sw-5.json b/data/grid5000/sites/sophia/network_equipments/sw-5.json index 373b150f9a2c9ddc665f13e608ac30c4e0dcc724..ff5287d6bff7022a6916bb5f17477079d6d42b79 100644 --- a/data/grid5000/sites/sophia/network_equipments/sw-5.json +++ b/data/grid5000/sites/sophia/network_equipments/sw-5.json @@ -11,6 +11,10 @@ { }, { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/1", + "uid": "esterel24-1" }, { }, diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json index 6a43eab206b6ec4294112c1f4047b1693371d546..cdd1d663c9ffb7b63351a61bde087b6b86d6db09 100644 --- a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json +++ b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json @@ -11,6 +11,9 @@ { }, { + "kind": "other", + "snmp_name": "1/1/1", + "uid": "esterel24-1-bmc" }, { }, diff --git a/input/grid5000/sites/sophia/clusters/esterel24/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel24/nodes.yaml.erb index 7a1726c538cf4324e963bcd6fce145fd73e3260b..b5a4f38f2b61f61cf430224ea0902caa247fab52 100644 --- a/input/grid5000/sites/sophia/clusters/esterel24/nodes.yaml.erb +++ b/input/grid5000/sites/sophia/clusters/esterel24/nodes.yaml.erb @@ -70,7 +70,7 @@ nodes: management: false driver: mlx_core # Fake data, will be replaced by g5k-checks name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks - rate: 10000000000 # Fake data, will be replaced by g5k-checks + rate: 1000000000 # Fake data, will be replaced by g5k-checks mac: <%= mac_eth0_list[i - 1] %> storage_devices: disk0: diff --git a/input/grid5000/sites/sophia/networks/sw-5.yaml b/input/grid5000/sites/sophia/networks/sw-5.yaml index 77e36ca09933b9019480337a8d5c9bda83e95e73..5e917fc226043c95209845e3461c60dd3fc6d502 100644 --- a/input/grid5000/sites/sophia/networks/sw-5.yaml +++ b/input/grid5000/sites/sophia/networks/sw-5.yaml @@ -14,6 +14,8 @@ sw-5: rate: 1000000000 kind: node ports: + 1: + uid: esterel24-1 25: uid: gw kind: router diff --git a/input/grid5000/sites/sophia/networks/swadmin-5.yaml b/input/grid5000/sites/sophia/networks/swadmin-5.yaml index 49fea65be4977c087c2313e80564774ffe3c6c41..b7f8a6dd894777e3dbc66943e5fe8fb6c8258c04 100644 --- a/input/grid5000/sites/sophia/networks/swadmin-5.yaml +++ b/input/grid5000/sites/sophia/networks/swadmin-5.yaml @@ -14,6 +14,9 @@ swadmin-5: rate: 1000000000 kind: node ports: + 1: + uid: esterel24-1-bmc + kind: other 25: uid: sw-5 kind: switch