diff --git a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json index 2bbe1494629cef4234881c49e0e556fe04ec52cb..5986ba7326810d6f3c459526afc556ecc5b789b2 100644 --- a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json +++ b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json @@ -252,44 +252,44 @@ "network_adapters": [ { "device": "eth0", - "driver": "igb", + "driver": "mlx5_core", "enabled": true, - "firmware_version": "3.25, 0x800005cc", + "firmware_version": "20.28.4000 (MT_0000000225)", "interface": "Ethernet", "ip": "172.16.56.1", "ip6": "2001:660:4406:400:9::1", "kavlan": true, - "mac": "5c:ff:35:e3:84:29", + "mac": "b8:ce:f6:2d:18:d6", "management": false, - "model": "I210 Gigabit Network Connection", + "model": "MT28908 Family [ConnectX-6]", "mountable": true, "mounted": true, - "name": "enp226s0", + "name": "enp225s0f0np0", "network_address": "sirius-1.lyon.grid5000.fr", - "rate": 1000000000, + "rate": 10000000000, "sriov": false, "sriov_totalvfs": 0, "switch": "gw", - "switch_port": "ethernet1/1/7", - "vendor": "Intel" + "switch_port": "ethernet1/1/26", + "vendor": "Mellanox Technologies" }, { "device": "eth1", - "driver": "mlx5_core", + "driver": "igb", "enabled": false, - "firmware_version": "20.28.4000 (MT_0000000225)", + "firmware_version": "3.25, 0x800005cc", "interface": "Ethernet", "kavlan": false, - "mac": "b8:ce:f6:2d:18:d6", + "mac": "5c:ff:35:e3:84:29", "management": false, - "model": "MT28908 Family [ConnectX-6]", + "model": "I210 Gigabit Network Connection", "mountable": false, "mounted": false, - "name": "enp225s0f0np0", - "rate": 100000000000, + "name": "enp226s0", + "rate": 1000000000, "sriov": false, "sriov_totalvfs": 0, - "vendor": "Mellanox Technologies" + "vendor": "Intel" }, { "device": "eth2", diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json index 2e99f55212794d304c98cc823ec0171f3f2587c6..97519d0443fb9e655591c30284c76d31d8dee13b 100644 --- a/data/grid5000/sites/lyon/network_equipments/gw.json +++ b/data/grid5000/sites/lyon/network_equipments/gw.json @@ -54,11 +54,6 @@ "uid": "pyxis-4" }, { - "kind": "node", - "port": "eth0", - "rate": 1000000000, - "snmp_name": "ethernet1/1/7", - "uid": "sirius-1" }, { "kind": "switch", @@ -157,6 +152,10 @@ "uid": "force10" }, { + "kind": "node", + "port": "eth0", + "snmp_name": "ethernet1/1/26", + "uid": "sirius-1" }, { }, diff --git a/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml b/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml index 7537be8c5fce4038266c6b22d05c1dfcba3dab7a..9e29c55136a4e5154246e68be602c99d03e24c58 100644 --- a/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml +++ b/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml @@ -88,11 +88,10 @@ sirius-1: ip: 172.17.56.1 mac: 5c:ff:35:e3:84:be management: true - eth0: + eth1: driver: igb firmware_version: 3.25, 0x800005cc interface: Ethernet - ip: 172.16.56.1 mac: 5c:ff:35:e3:84:29 management: false model: I210 Gigabit Network Connection @@ -101,12 +100,13 @@ sirius-1: sriov: false sriov_totalvfs: 0 vendor: Intel - eth1: + eth0: name: enp225s0f0np0 interface: Ethernet driver: mlx5_core + ip: 172.16.56.1 mac: b8:ce:f6:2d:18:d6 - rate: 100000000000 + rate: 10000000000 firmware_version: 20.28.4000 (MT_0000000225) model: MT28908 Family [ConnectX-6] vendor: Mellanox Technologies diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml index 4c4ec5b1ded644e4b19331347bdaa880ec49ff60..698cc70a7e705a80919290fc164b2f7fa69c2e39 100644 --- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml +++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml @@ -127,9 +127,6 @@ gw: 4: pyxis-2 5: pyxis-3 6: pyxis-4 - 7: - uid: sirius-1 - rate: 1000000000 8: uid: sneowise kind: switch @@ -161,6 +158,7 @@ gw: uid: force10 kind: switch port: '0:60' + 26: sirius-1 29: uid: sw-admin kind: other