From 8f70b5c678413b8d10b161a37a58854526d7703b Mon Sep 17 00:00:00 2001
From: Pierre JACQUOT <pierre.jacquot@inria.fr>
Date: Wed, 15 Mar 2023 10:43:52 +0100
Subject: [PATCH] [toulouse][montcalm] Add missing information for global
hardware page.
---
.../sites/toulouse/clusters/montcalm/nodes/montcalm-1.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-2.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-3.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-4.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-5.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-6.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-7.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-8.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/nodes/montcalm-9.json | 7 +++++--
.../sites/toulouse/clusters/montcalm/montcalm.yaml | 7 +++++--
10 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index d98d05d06ed..92eadadd0ca 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.1",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:9b:36",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-1.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/1"
+ "switch_port": "tengigabitethernet1/1/1",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index c6b4c226f01..6843ad4b0c7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.2",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4a:29:04",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-2.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/2"
+ "switch_port": "tengigabitethernet1/1/2",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index 39237c5fa76..771e390fb16 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.3",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:fe:6c",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-3.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/3"
+ "switch_port": "tengigabitethernet1/1/3",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index 1369e347341..900f2fe5984 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.4",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:de:14",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-4.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/4"
+ "switch_port": "tengigabitethernet1/1/4",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index d991062a9d8..2feba7799be 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.5",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:1a:ae",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-5.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/5"
+ "switch_port": "tengigabitethernet1/1/5",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index 4a7653bab09..5c75d1ebabb 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.6",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:cd:8e",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-6.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/6"
+ "switch_port": "tengigabitethernet1/1/6",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index cf54093e1c6..23b683b952e 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.7",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:c1:88",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-7.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/7"
+ "switch_port": "tengigabitethernet1/1/7",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index e9ce7bb4e39..7eddc50fdc5 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.8",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:cd:46",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-8.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/8"
+ "switch_port": "tengigabitethernet1/1/8",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index d7c4d0658ed..5951a2e4221 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -37,6 +37,7 @@
{
"bridged": false,
"device": "eth0",
+ "driver": "bnxt_en",
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.120.9",
@@ -44,13 +45,15 @@
"kavlan": false,
"mac": "84:16:0c:4b:2e:28",
"management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
"mountable": true,
"mounted": true,
"name": "ens10f0np0",
"network_address": "montcalm-9.toulouse.grid5000.fr",
"rate": 10000000000,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/9"
+ "switch_port": "tengigabitethernet1/1/9",
+ "vendor": "Broadcom Inc. and subsidiaries"
},
{
"device": "bmc",
@@ -101,7 +104,7 @@
"storage_devices": [
{
"by_id": "",
- "id": "Unknown",
+ "id": "disk0",
"interface": "SATA",
"model": "HPE P40498-B21",
"size": 1030792151040,
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
index a0795dc34bb..67aa8ba5206 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
@@ -43,6 +43,9 @@ nodes:
rate: 10000000000
management: false
name: ens10f0np0
+ vendor: Broadcom Inc. and subsidiaries
+ model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+ driver: bnxt_en
enabled: true
mountable: true
mounted: true
@@ -69,9 +72,9 @@ nodes:
vendor: Intel
version: Silver 4314
storage_devices:
- disk0:
+ pci-0000:00:17.0-ata-1:
size: 1030792151040
- id: Unknown
+ id: disk0
model: HPE P40498-B21
interface: SATA
storage: SSD
--
GitLab