From 53ab86600133d49fead33c98de5af6573fd2baee Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Fri, 4 Jun 2021 10:27:42 +0200
Subject: [PATCH] [lyon/neowise] Add net_names_mapping for cluster neowise
---
.../sites/lyon/clusters/neowise/neowise.json | 89 ++++++++++++++++++-
.../clusters/neowise/nodes/neowise-1.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-10.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-2.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-3.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-4.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-5.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-6.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-7.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-9.json | 57 ++++++------
.../clusters/neowise/nodes/neowise-1.yaml | 4 +-
.../clusters/neowise/nodes/neowise-10.yaml | 4 +-
.../clusters/neowise/nodes/neowise-2.yaml | 4 +-
.../clusters/neowise/nodes/neowise-3.yaml | 4 +-
.../clusters/neowise/nodes/neowise-4.yaml | 4 +-
.../clusters/neowise/nodes/neowise-5.yaml | 4 +-
.../clusters/neowise/nodes/neowise-6.yaml | 4 +-
.../clusters/neowise/nodes/neowise-7.yaml | 4 +-
.../clusters/neowise/nodes/neowise-9.yaml | 4 +-
lib/refrepo/net_names_mapping.yaml | 3 +
20 files changed, 361 insertions(+), 280 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/neowise/neowise.json b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
index d9d360527a1..fca181cd299 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/neowise.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
@@ -3,7 +3,94 @@
"exotic": true,
"kavlan": false,
"metrics": [
-
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ }
],
"model": "AMD-Penguin Computing",
"queues": [
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index 256e054c039..3e591d6d2e6 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.1",
+ "ip6": "2001:660:4406:400:8::1",
"kavlan": false,
+ "mac": "18:c0:4d:11:37:a1",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-1.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-1.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/11",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.11",
+ "ip6": "2001:660:4406:400:8:1:0:1",
"kavlan": false,
+ "mac": "18:c0:4d:11:37:a2",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-1.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-1.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/1",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-1-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.1",
- "kavlan": false,
- "mac": "18:c0:4d:11:37:a1",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:11:37:a2",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index d15c50f25b1..be80c4d37fb 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.10",
+ "ip6": "2001:660:4406:400:8::a",
"kavlan": false,
+ "mac": "18:c0:4d:4e:b1:0f",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-10.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-10.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/20",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.20",
+ "ip6": "2001:660:4406:400:8:1:0:a",
"kavlan": false,
+ "mac": "18:c0:4d:4e:b1:10",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-10.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-10.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/10",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-10-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.10",
- "kavlan": false,
- "mac": "18:c0:4d:4e:b1:0f",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:4e:b1:10",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index 28549727091..cc2032eda9f 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.2",
+ "ip6": "2001:660:4406:400:8::2",
"kavlan": false,
+ "mac": "18:c0:4d:75:ef:3c",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-2.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-2.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/12",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.12",
+ "ip6": "2001:660:4406:400:8:1:0:2",
"kavlan": false,
+ "mac": "18:c0:4d:75:ef:3d",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-2.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-2.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/2",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-2-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.2",
- "kavlan": false,
- "mac": "18:c0:4d:75:ef:3c",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:75:ef:3d",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index f152a3c6c4c..d718304e755 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.3",
+ "ip6": "2001:660:4406:400:8::3",
"kavlan": false,
+ "mac": "18:c0:4d:4a:ed:5d",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-3.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-3.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/13",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.13",
+ "ip6": "2001:660:4406:400:8:1:0:3",
"kavlan": false,
+ "mac": "18:c0:4d:4a:ed:5e",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-3.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-3.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/3",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-3-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.3",
- "kavlan": false,
- "mac": "18:c0:4d:4a:ed:5d",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:4a:ed:5e",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index aaf27d51be0..6cdddc47175 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.4",
+ "ip6": "2001:660:4406:400:8::4",
"kavlan": false,
+ "mac": "18:c0:4d:4e:b1:07",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-4.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-4.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/14",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.14",
+ "ip6": "2001:660:4406:400:8:1:0:4",
"kavlan": false,
+ "mac": "18:c0:4d:4e:b1:08",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-4.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-4.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/4",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-4-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.4",
- "kavlan": false,
- "mac": "18:c0:4d:4e:b1:07",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:4e:b1:08",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index 1d04d5e8c75..f633fbaf0fb 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.5",
+ "ip6": "2001:660:4406:400:8::5",
"kavlan": false,
+ "mac": "18:c0:4d:75:f1:38",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-5.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-5.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/15",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.15",
+ "ip6": "2001:660:4406:400:8:1:0:5",
"kavlan": false,
+ "mac": "18:c0:4d:75:f1:39",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-5.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-5.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/5",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-5-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.5",
- "kavlan": false,
- "mac": "18:c0:4d:75:f1:38",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:75:f1:39",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index ac915a03e8e..18a33ec415a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.6",
+ "ip6": "2001:660:4406:400:8::6",
"kavlan": false,
+ "mac": "18:c0:4d:4a:ed:09",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-6.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-6.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/16",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.16",
+ "ip6": "2001:660:4406:400:8:1:0:6",
"kavlan": false,
+ "mac": "18:c0:4d:4a:ed:0a",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-6.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-6.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/6",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-6-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.6",
- "kavlan": false,
- "mac": "18:c0:4d:4a:ed:09",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:4a:ed:0a",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index fe5a585cfcc..67724823de1 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.7",
+ "ip6": "2001:660:4406:400:8::7",
"kavlan": false,
+ "mac": "18:c0:4d:1e:89:64",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-7.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-7.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/17",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.17",
+ "ip6": "2001:660:4406:400:8:1:0:7",
"kavlan": false,
+ "mac": "18:c0:4d:1e:89:65",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-7.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-7.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/7",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-7-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.7",
- "kavlan": false,
- "mac": "18:c0:4d:1e:89:64",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "18:c0:4d:1e:89:65",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index 0564f2e3b44..a5bc6deb67d 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -98,19 +98,45 @@
"network_adapters": [
{
"device": "eth0",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.9",
+ "ip6": "2001:660:4406:400:8::9",
"kavlan": false,
+ "mac": "b4:2e:99:b4:c6:fa",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-9.lyon.grid5000.fr"
+ "name": "eno1",
+ "network_address": "neowise-9.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "gw",
+ "switch_port": "ethernet1/1/19",
+ "vendor": "Mellanox Technologies"
},
{
"device": "eth1",
+ "driver": "mlx5_core",
"enabled": true,
+ "firmware_version": "14.22.1002 (GIG0000000005)",
+ "interface": "Ethernet",
+ "ip": "172.16.55.19",
+ "ip6": "2001:660:4406:400:8:1:0:9",
"kavlan": false,
+ "mac": "b4:2e:99:b4:c6:fb",
+ "management": false,
+ "model": "MT27710 Family [ConnectX-4 Lx]",
"mountable": true,
"mounted": true,
- "network_address": "neowise-9.lyon.grid5000.fr"
+ "name": "eno2",
+ "network_address": "neowise-9.lyon.grid5000.fr",
+ "rate": 10000000000,
+ "switch": "sneowise",
+ "switch_port": "1/9",
+ "vendor": "Mellanox Technologies"
},
{
"device": "ib0",
@@ -159,33 +185,6 @@
"mountable": false,
"mounted": false,
"network_address": "neowise-9-bmc.lyon.grid5000.fr"
- },
- {
- "device": "eno1",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "ip": "172.16.55.9",
- "kavlan": false,
- "mac": "b4:2e:99:b4:c6:fa",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "eno2",
- "driver": "mlx5_core",
- "firmware_version": "14.22.1002 (GIG0000000005)",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "b4:2e:99:b4:c6:fb",
- "management": false,
- "model": "MT27710 Family [ConnectX-4 Lx]",
- "name": "eno2",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
}
],
"operating_system": {
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
index 3b1bca3bf6f..96f4593d8dd 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
@@ -88,7 +88,7 @@ neowise-1:
ip: 172.17.55.1
mac: 18:c0:4d:11:37:a3
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-1:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
index 7a6cfb3b704..d63def86bbe 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
@@ -88,7 +88,7 @@ neowise-10:
ip: 172.17.55.10
mac: 18:c0:4d:4e:b1:11
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-10:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
index 76c4ffd4a01..66668caeba2 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
@@ -88,7 +88,7 @@ neowise-2:
ip: 172.17.55.2
mac: 18:c0:4d:75:ef:3e
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-2:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
index 9c8235483d9..19459b9159d 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
@@ -88,7 +88,7 @@ neowise-3:
ip: 172.17.55.3
mac: 18:c0:4d:4a:ed:5f
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-3:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
index cb6c8a1fae4..1f9e690d53f 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
@@ -88,7 +88,7 @@ neowise-4:
ip: 172.17.55.4
mac: 18:c0:4d:4e:b1:09
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-4:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
index 042f3a01425..8c56be71eec 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
@@ -88,7 +88,7 @@ neowise-5:
ip: 172.17.55.5
mac: 18:c0:4d:75:f1:3a
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-5:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
index d2ec58c24aa..ff820408a41 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
@@ -88,7 +88,7 @@ neowise-6:
ip: 172.17.55.6
mac: 18:c0:4d:4a:ed:0b
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-6:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
index 0fb8e2783c7..6b76ed81c25 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
@@ -88,7 +88,7 @@ neowise-7:
ip: 172.17.55.7
mac: 18:c0:4d:1e:89:66
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-7:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
index 0a875233e94..50e05c28215 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
@@ -88,7 +88,7 @@ neowise-9:
ip: 172.17.55.9
mac: b4:2e:99:b4:c6:fc
management: true
- eno1:
+ eth0:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
@@ -99,7 +99,7 @@ neowise-9:
name: eno1
rate: 10000000000
vendor: Mellanox Technologies
- eno2:
+ eth1:
driver: mlx5_core
firmware_version: 14.22.1002 (GIG0000000005)
interface: Ethernet
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 314a40b7cda..d6d68f1896b 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -137,6 +137,9 @@ nova:
eno4: eth5
enp5s0f0: eth0
enp5s0f1: eth1
+neowise:
+ eno1: eth0
+ eno2: eth1
orion:
eno1: eth2
eno2: eth3
--
GitLab