diff --git a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
index 2fc681f95767cfbac7584a64cfff9c8e8de7a07f..b9b8568cd599bb60d426dd336dc6a4d6468b8a10 100644
--- a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json
@@ -9,7 +9,7 @@
],
"model": "Cluster Model",
"nodes_count": 1,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 2x0GB SSD, 1 x 10Gb Ethernet",
+ "nodes_description": "2 CPUs Intel Xeon E5-2623 v4, 4 cores/CPU, 32GB RAM, 2x372GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
"priority": 197001,
"queues": [
"admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json b/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json
index ce5bd2d7cfb9f667991bb7bcc3bf6147aff22dcb..4a69e5440b9dac5d60671852bc65a3595d646661 100644
--- a/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-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": 8,
+ "nb_procs": 2,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "12/12/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
},
- "bmc_version": "v1",
+ "bmc_version": "2.86",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge R730",
+ "serial": "88Y9RG2",
"warranty_end": "1970-01-01"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 34359738368
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,111 @@
},
"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": "tg3",
"enabled": true,
+ "firmware_version": "FFV22.61.8 bc 5720-v1.39",
"interface": "Ethernet",
"ip": "172.16.131.1",
"ip6": "2001:660:4406:800:4::1",
"kavlan": false,
"mac": "18:66:da:ed:2c:44",
"management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "esterel1-1.sophia.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-6",
+ "switch_port": "1/1/13",
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth1",
+ "driver": "tg3",
+ "firmware_version": "FFV22.61.8 bc 5720-v1.39",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "18:66:da:ed:2c:45",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+ "name": "eno2",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth2",
+ "driver": "tg3",
+ "firmware_version": "FFV22.61.8 bc 5720-v1.39",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "18:66:da:ed:2c:46",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+ "name": "eno3",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth3",
+ "driver": "tg3",
+ "firmware_version": "FFV22.61.8 bc 5720-v1.39",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "18:66:da:ed:2c:47",
+ "management": false,
+ "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+ "name": "eno4",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.36.5000",
+ "guid": "0x7cfe900300bf0d41",
+ "interface": "InfiniBand",
+ "ip": "172.18.131.1",
+ "kavlan": false,
+ "mac": "7c:fe:90:03:00:bf:0d:41",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "esterel1-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,32 +152,32 @@
],
"nodeset": "esterel1",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
- "ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": false,
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 128,
- "node_flops": 9216
+ "node_flops": 1024
},
"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": 10485760,
"clock_speed": 8,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Haswell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0xb000040",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2623 v4 @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "E5-2623 v4"
},
"redfish": true,
"software": {
@@ -104,24 +187,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x61866da07c7090001fcad360885bea08",
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H730 Mini",
+ "size": 399431958528,
+ "storage": "HDD",
+ "vendor": "Dell"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x61866da07c7090001fcad58ba96aaf8a",
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
"id": "disk1",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H730 Mini",
+ "size": 399431958528,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -131,7 +216,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "esterel1-1"
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 11bac905e7d0a505e246e2485ea65a8806e62e5c..ca71c539b03ec57cce6da052ffbc026aac79e035 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -126,6 +126,7 @@ ipv4:
sophia mercantour6 ib0 0 0 2 45
sophia mercantour7 eth0 0 0 2 46
sophia esterel1 eth0 0 0 3 0
+ sophia esterel1 ib0 0 0 3 0
sophia esterel2 eth0 0 0 3 1
sophia esterel3 eth0 0 0 3 2
sophia esterel4 eth0 0 0 3 3
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
index a907cb04de3a0ffd6fd326c1b567d896fab69cb4..8999f20a787aa7077b2287969e4b6bd3e67e960b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml
@@ -30,11 +30,11 @@ nodes:
mountable: true
mounted: true
storage_devices:
- disk0: # This field will have to be renamed later.
+ pci-0000:03:00.0-scsi-0:2:0:0: # This field will have to be renamed later.
id: disk0
interface: SAS
by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" # this path will have to change later.
- disk1:
+ pci-0000:03:00.0-scsi-0:2:1:0:
id: disk1
interface: SAS
by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..74090dcbcc2913b76b77ba79259a23f5f176ee1b
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml
@@ -0,0 +1,10 @@
+nodes:
+ esterel1-1:
+ network_adapters:
+ ib0:
+ enabled: true
+ mountable: true
+ mounted: true
+ management: false
+ interface: InfiniBand
+ netmask: 255.255.240.0
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb
deleted file mode 100644
index 6048d7e052af3305fddb36e9c4b4e2f99ccb89c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/esterel1/nodes.yaml.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-<%
- # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv
- # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
-
- cluster_name = "esterel1"
- nodes_number = 1 # Size of the cluster (number of nodes)
- # MAC addresses declaration
- mac_eth0_list = %w(
-18:66:da:ed:2c:44
- )
- mac_bmc_list = %w(
-18:fb:7b:a8:b6:a1
- )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
- architecture:
- nb_procs: 1 # Fake data, will be replaced by g5k-checks
- nb_cores: 72 # Fake data, will be replaced by g5k-checks
- nb_threads: 72 # Fake data, will be replaced by g5k-checks
- platform_type: x86_64 # Fake data, will be replaced by g5k-checks
- cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
- 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:
- management: true
- mac: <%= mac_bmc_list[i - 1] %>
- eth0:
- interface: Ethernet
- 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
- mac: <%= mac_eth0_list[i - 1] %>
- storage_devices:
- disk0:
- storage: SSD # Fake data, will be replaced by g5k-checks
- model: unknown # Fake data, will be replaced by g5k-checks
- size: 8 # Fake data, will be replaced by g5k-checks
- disk1:
- storage: SSD # Fake data, will be replaced by g5k-checks
- model: unknown # Fake data, will be replaced by g5k-checks
- size: 8 # Fake data, will be replaced by g5k-checks
-<% } %>
diff --git a/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml b/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e1eb832b0d13552dfb853055b97e708f1b960c51
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml
@@ -0,0 +1,132 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel1-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 8
+ nb_procs: 2
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 12/12/2023
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: '2.86'
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge R730
+ serial: 88Y9RG2
+ 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.131.1
+ mac: 18:fb:7b:a8:b6:a1
+ management: true
+ eth0:
+ driver: tg3
+ firmware_version: FFV22.61.8 bc 5720-v1.39
+ interface: Ethernet
+ ip: 172.16.131.1
+ mac: 18:66:da:ed:2c:44
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth1:
+ driver: tg3
+ firmware_version: FFV22.61.8 bc 5720-v1.39
+ interface: Ethernet
+ mac: 18:66:da:ed:2c:45
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: eno2
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth2:
+ driver: tg3
+ firmware_version: FFV22.61.8 bc 5720-v1.39
+ interface: Ethernet
+ mac: 18:66:da:ed:2c:46
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: eno3
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth3:
+ driver: tg3
+ firmware_version: FFV22.61.8 bc 5720-v1.39
+ interface: Ethernet
+ mac: 18:66:da:ed:2c:47
+ management: false
+ model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+ name: eno4
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.36.5000
+ guid: '0x7cfe900300bf0d41'
+ interface: InfiniBand
+ ip: 172.18.131.1
+ mac: 7c:fe:90:03:00:bf:0d:41
+ management: false
+ model: MT27500 Family [ConnectX-3]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: false
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 10485760
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xb000040'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2623 v4 @ 2.60GHz
+ vendor: Intel
+ version: E5-2623 v4
+ storage_devices:
+ pci-0000:03:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x61866da07c7090001fcad360885bea08"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H730 Mini
+ size: 399431958528
+ storage: HDD
+ pci-0000:03:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x61866da07c7090001fcad58ba96aaf8a"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H730 Mini
+ size: 399431958528
+ storage: HDD
+ supported_job_types:
+ virtual: ivt