From 44bbbd89191cf13ef910e2753e843a617596070a Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 17 Feb 2025 13:21:49 +0100
Subject: [PATCH] [Grenoble][Chartreuse2] Add chartreuse2 cluster configuration
---
.../chartreuse2/nodes/chartreuse2-1.json | 110 ++++++++++++------
.../chartreuse2/nodes/chartreuse2-2.json | 110 ++++++++++++------
.../chartreuse2/nodes/chartreuse2-3.json | 110 ++++++++++++------
.../chartreuse2/nodes/chartreuse2-4.json | 110 ++++++++++++------
input/grid5000/dell-product-data.yaml | 18 +++
input/grid5000/disks.yaml | 1 +
.../clusters/chartreuse2/chartreuse2.yaml | 8 +-
.../clusters/chartreuse2/nodes.yaml.erb | 92 ---------------
.../chartreuse2/nodes/chartreuse2-1.yaml | 91 +++++++++++++++
.../chartreuse2/nodes/chartreuse2-2.yaml | 91 +++++++++++++++
.../chartreuse2/nodes/chartreuse2-3.yaml | 91 +++++++++++++++
.../chartreuse2/nodes/chartreuse2-4.yaml | 91 +++++++++++++++
lib/refrepo/net_names_mapping.yaml | 3 +
13 files changed, 692 insertions(+), 234 deletions(-)
delete mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse2/nodes.yaml.erb
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
index 31a25506ee5..a4de9c8bcbd 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
- "nb_threads": 72,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 20,
+ "nb_procs": 2,
+ "nb_threads": 40,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
},
- "bmc_version": "v1",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2016-11-14",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "504GSG2",
"warranty_end": "2021-11-13"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 34359738368
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,49 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "ixgbe",
"enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
"interface": "Ethernet",
"ip": "172.16.26.5",
"ip6": "2001:660:4406:100:b::5",
"kavlan": false,
"mac": "7c:d3:0a:bf:38:d4",
"management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "chartreuse2-1.grenoble.grid5000.fr",
"rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
"switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/5"
+ "switch_port": "1/1/5",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -65,36 +86,53 @@
"mountable": false,
"mounted": false,
"network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
+ },
+ {
+ "device": "eno2",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:38:d6",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
}
],
"nodeset": "chartreuse2",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 38400000000,
- "node_flops": 2764800000000
+ "node_flops": 768000000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 26214400,
"clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v4"
},
"redfish": true,
"software": {
@@ -104,14 +142,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x50000397583beef9",
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "DM06",
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "AL14SEB120N",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Toshiba"
}
],
"supported_job_types": {
@@ -121,7 +160,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "chartreuse2-1"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
index 872fd76aeb7..d2bfc332381 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
- "nb_threads": 72,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 20,
+ "nb_procs": 2,
+ "nb_threads": 40,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
},
- "bmc_version": "v1",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2016-11-14",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "501NSG2",
"warranty_end": "2021-11-13"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 34359738368
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,49 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "ixgbe",
"enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
"interface": "Ethernet",
"ip": "172.16.26.6",
"ip6": "2001:660:4406:100:b::6",
"kavlan": false,
"mac": "7c:d3:0a:bf:40:24",
"management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "chartreuse2-2.grenoble.grid5000.fr",
"rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
"switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/7"
+ "switch_port": "1/1/7",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -65,36 +86,53 @@
"mountable": false,
"mounted": false,
"network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
+ },
+ {
+ "device": "eno2",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:40:26",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
}
],
"nodeset": "chartreuse2",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 38400000000,
- "node_flops": 2764800000000
+ "node_flops": 768000000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 26214400,
"clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v4"
},
"redfish": true,
"software": {
@@ -104,14 +142,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x50000397582b2a1d",
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "DM06",
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "AL14SEB120N",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Toshiba"
}
],
"supported_job_types": {
@@ -121,7 +160,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "chartreuse2-2"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
index 15ff86ffe97..63f017ae0c3 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
- "nb_threads": 72,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 20,
+ "nb_procs": 2,
+ "nb_threads": 40,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
},
- "bmc_version": "v1",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2016-11-14",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "503FSG2",
"warranty_end": "2021-11-13"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 34359738368
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,49 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "ixgbe",
"enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
"interface": "Ethernet",
"ip": "172.16.26.7",
"ip6": "2001:660:4406:100:b::7",
"kavlan": false,
"mac": "7c:d3:0a:bf:41:08",
"management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "chartreuse2-3.grenoble.grid5000.fr",
"rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
"switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/6"
+ "switch_port": "1/1/6",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -65,36 +86,53 @@
"mountable": false,
"mounted": false,
"network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
+ },
+ {
+ "device": "eno2",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:41:0a",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
}
],
"nodeset": "chartreuse2",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 38400000000,
- "node_flops": 2764800000000
+ "node_flops": 768000000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 26214400,
"clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v4"
},
"redfish": true,
"software": {
@@ -104,14 +142,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x500003975839a991",
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "DM06",
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "AL14SEB120N",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Toshiba"
}
],
"supported_job_types": {
@@ -121,7 +160,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "chartreuse2-3"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
index c6c39bf8015..033e736499a 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
- "nb_threads": 72,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 20,
+ "nb_procs": 2,
+ "nb_threads": 40,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
},
- "bmc_version": "v1",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2016-11-14",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "505MSG2",
"warranty_end": "2021-11-13"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 34359738368
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,49 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "ixgbe",
"enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
"interface": "Ethernet",
"ip": "172.16.26.8",
"ip6": "2001:660:4406:100:b::8",
"kavlan": false,
"mac": "7c:d3:0a:bf:3f:ee",
"management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "chartreuse2-4.grenoble.grid5000.fr",
"rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
"switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/8"
+ "switch_port": "1/1/8",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -65,36 +86,53 @@
"mountable": false,
"mounted": false,
"network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
+ },
+ {
+ "device": "eno2",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "7c:d3:0a:bf:3f:f0",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
}
],
"nodeset": "chartreuse2",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 38400000000,
- "node_flops": 2764800000000
+ "node_flops": 768000000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 26214400,
"clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v4"
},
"redfish": true,
"software": {
@@ -104,14 +142,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x50000397583a5e3d",
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "DM06",
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "AL14SEB120N",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Toshiba"
}
],
"supported_job_types": {
@@ -121,7 +160,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "chartreuse2-4"
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 1940c6c1f9d..802fa63eb4e 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -178,6 +178,24 @@ sites:
chassis:
manufactured_at: 2017-12-26
warranty_end: 2024-12-26
+ chartreuse2:
+ nodes:
+ chartreuse2-1:
+ chassis:
+ manufactured_at: 2016-11-14
+ warranty_end: 2021-11-13
+ chartreuse2-1:
+ chassis:
+ manufactured_at: 2016-11-14
+ warranty_end: 2021-11-13
+ chartreuse2-1:
+ chassis:
+ manufactured_at: 2016-11-14
+ warranty_end: 2021-11-14
+ chartreuse2-1:
+ chassis:
+ manufactured_at: 2016-11-14
+ warranty_end: 2021-11-13
lille:
clusters:
chiclet:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 06badcad222..e0b73ab30d9 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -52,6 +52,7 @@ disk_vendor_model_mapping:
- PX04SMB040
- PX05SVB048Y
- MG04SCA40ENY
+ - AL14SEB120N
- AL15SEB060NY
- KRM5XVUG1T92
- KPM5XVUG1T92
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
index e824ea76814..903f54e649e 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -21,6 +21,7 @@ nodes:
clock_speed: 2400000000
network_adapters:
bmc:
+ interface: Ethernet
enabled: true
mountable: false
mounted: false
@@ -28,9 +29,12 @@ nodes:
enabled: true
mountable: true
mounted: true
+ eno2:
+ enabled: false
+ mountable: false
+ mounted: false
storage_devices:
- #pci-0000:02:00.0-sas-phy0-lun-0:
- disk0:
+ pci-0000:02:00.0-sas-phy0-lun-0:
interface: SAS
id: disk0
by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes.yaml.erb
deleted file mode 100644
index 8dc355d26ff..00000000000
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes.yaml.erb
+++ /dev/null
@@ -1,92 +0,0 @@
-<%
- cluster_name = "chartreuse2"
- nodes_number = 4
- site_ipv4_index = 26
- nodes_index = 4
- # MAC addresses declaration
- # TODO: Change MAC addresses.
- mac_eth0_list = %w(
- 7c:d3:0a:bf:38:d4
- 7c:d3:0a:bf:40:24
- 7c:d3:0a:bf:41:08
- 7c:d3:0a:bf:3f:ee
- )
-
- # TODO: Change MAC addresses.
- mac_bmc_list = %w(
- 7c:d3:0a:bf:38:d8
- 7c:d3:0a:bf:40:28
- 7c:d3:0a:bf:41:0c
- 7c:d3:0a:bf:3f:f2
- )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
- architecture:
- nb_procs: 1
- nb_cores: 72
- nb_threads: 72
- platform_type: x86_64
- cpu_core_numbering: contiguous
- bios:
- release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
- vendor: Unknown # Fake vendor, will be replaced by g5k-checks
- version: 1 # Fake version, will be replaced by g5k-checks
- bmc_version: v1 # Fake version, will be replaced by g5k-checks
- chassis:
- manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
- name: Unknown # Fake name, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake size, will be replaced by g5k-checks
- memory_devices:
- dimm:
- size: 8 # Fake size, will be replaced by g5k-checks
- technology: dram # Common memory technology, will be replaced by g5k-checks
- processor:
- model: Unknown # Fake model name, will be replaced by g5k-checks
- other_description: description # Fake description, will be replaced by g5k-checks
- vendor: vendor # Fake vendor, will be replaced by g5k-checks
- version: vendor # Fake version, will be replaced by g5k-checks
- cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
- cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
- cache_l2: 8 # Fake cache, will be replaced by g5k-checks
- cache_l3: 8 # Fake cache, will be replaced by g5k-checks
- instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
- microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
- ht_capable: true # Default ht capable value, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake ram size, will be replaced by g5k-checks
- memory_devices:
- dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
- size: 8 # Fake dimm size, will be replaced by g5k-checks
- technology: dram # Default dimm technology, will be replaced by g5k-checks
- operating_system:
- cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
- cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
- ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
- pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
- pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
- turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
- network_adapters:
- bmc:
- interface: Ethernet
- management: true
- mac: <%= mac_bmc_list[i - 1] %>
- ip: 172.17.<%= site_ipv4_index %>.<%= i + nodes_index %>
- eth0:
- interface: Ethernet
- management: false
- driver: mlx_core
- name: enp1s0f0np0
- rate: 10000000000
- mac: <%= mac_eth0_list[i - 1] %>
- ip: 172.16.<%= site_ipv4_index %>.<%= i + nodes_index %>
- storage_devices:
- disk0:
- storage: SSD # Common value, will be replaced by g5k-checks
- model: unknown # fake value,
- size: 8 # Fake value, will be replaced by g5k-checks
-<% } %>
-
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
new file mode 100644
index 00000000000..2ee1c2f8999
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 20
+ nb_procs: 2
+ nb_threads: 40
+ platform_type: x86_64
+ bios:
+ release_date: 02/21/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 504GSG2
+ main_memory:
+ ram_size: 34359738368
+ memory_devices:
+ dimm_a1:
+ size: 8589934592
+ technology: dram
+ dimm_a2:
+ size: 8589934592
+ technology: dram
+ dimm_b1:
+ size: 8589934592
+ technology: dram
+ dimm_b2:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.5
+ mac: 7c:d3:0a:bf:38:d8
+ management: true
+ eno2:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 7c:d3:0a:bf:38:d6
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.5
+ mac: 7c:d3:0a:bf:38:d4
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 26214400
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xb000040'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+ vendor: Intel
+ version: E5-2640 v4
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x50000397583beef9"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: DM06
+ model: AL14SEB120N
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
new file mode 100644
index 00000000000..d1718168844
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-2:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 20
+ nb_procs: 2
+ nb_threads: 40
+ platform_type: x86_64
+ bios:
+ release_date: 02/21/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 501NSG2
+ main_memory:
+ ram_size: 34359738368
+ memory_devices:
+ dimm_a1:
+ size: 8589934592
+ technology: dram
+ dimm_a2:
+ size: 8589934592
+ technology: dram
+ dimm_b1:
+ size: 8589934592
+ technology: dram
+ dimm_b2:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.6
+ mac: 7c:d3:0a:bf:40:28
+ management: true
+ eno2:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 7c:d3:0a:bf:40:26
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.6
+ mac: 7c:d3:0a:bf:40:24
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 26214400
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xb000040'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+ vendor: Intel
+ version: E5-2640 v4
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x50000397582b2a1d"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: DM06
+ model: AL14SEB120N
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
new file mode 100644
index 00000000000..83dea645e99
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-3:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 20
+ nb_procs: 2
+ nb_threads: 40
+ platform_type: x86_64
+ bios:
+ release_date: 02/21/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 503FSG2
+ main_memory:
+ ram_size: 34359738368
+ memory_devices:
+ dimm_a1:
+ size: 8589934592
+ technology: dram
+ dimm_a2:
+ size: 8589934592
+ technology: dram
+ dimm_b1:
+ size: 8589934592
+ technology: dram
+ dimm_b2:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.7
+ mac: 7c:d3:0a:bf:41:0c
+ management: true
+ eno2:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 7c:d3:0a:bf:41:0a
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.7
+ mac: 7c:d3:0a:bf:41:08
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 26214400
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xb000040'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+ vendor: Intel
+ version: E5-2640 v4
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x500003975839a991"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: DM06
+ model: AL14SEB120N
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
new file mode 100644
index 00000000000..517821b9a04
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse2-4:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 20
+ nb_procs: 2
+ nb_threads: 40
+ platform_type: x86_64
+ bios:
+ release_date: 02/21/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 505MSG2
+ main_memory:
+ ram_size: 34359738368
+ memory_devices:
+ dimm_a1:
+ size: 8589934592
+ technology: dram
+ dimm_a2:
+ size: 8589934592
+ technology: dram
+ dimm_b1:
+ size: 8589934592
+ technology: dram
+ dimm_b2:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.8
+ mac: 7c:d3:0a:bf:3f:f2
+ management: true
+ eno2:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 7c:d3:0a:bf:3f:f0
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.8
+ mac: 7c:d3:0a:bf:3f:ee
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 26214400
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xb000040'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v4 @ 2.40GHz
+ vendor: Intel
+ version: E5-2640 v4
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x50000397583a5e3d"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: DM06
+ model: AL14SEB120N
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index fecfe57ebcd..458a667af8c 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -112,6 +112,9 @@ drac:
enP1p1s0f3: eth3
enP9p7s0f0: eth4
enP9p7s0f1: eth5
+chartreuse2:
+ enp1s0f0np0: eth0
+ enp129s0f1: eth1
econome:
eno1: eth2
eno2: eth3
--
GitLab