diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
index 44f3af7cc3e5127dc2e4a00e5e1f39c2f520b6b6..147ee11b5449ab9c00c6d369d1d91a21912ae645 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
@@ -53,8 +53,8 @@
],
"model": "Dell PowerEdge T630",
"nodes_count": 1,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet",
- "priority": 201606,
+ "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+ "priority": 201706,
"queues": [
"admin",
"testing"
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 9410758c46547ababe778e3b11b10b9aa2a2c772..5936ae1353803172434a3caac2d1c326bb176cc9 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -1,26 +1,97 @@
{
"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": "10/18/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.18.2"
},
- "bmc_version": "v1",
+ "bmc_version": "2.85.85.85",
"chassis": {
"manufactured_at": "2016-06-06",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge T630",
+ "serial": "DPSDDD2",
"warranty_end": "2021-06-06"
},
"exotic": false,
+ "gpu_devices": {
+ "nvidia0": {
+ "compute_capability": "5.2",
+ "cores": 3072,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia0",
+ "memory": 12884901888,
+ "microarchitecture": "Maxwell",
+ "model": "GeForce GTX TITAN X",
+ "performance": {
+ "fp-16": 0,
+ "fp-32": 66050000000000,
+ "fp-64": 206500000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "84.00.45.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia1": {
+ "compute_capability": "5.2",
+ "cores": 3072,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia1",
+ "memory": 12884901888,
+ "microarchitecture": "Maxwell",
+ "model": "GeForce GTX TITAN X",
+ "performance": {
+ "fp-16": 0,
+ "fp-32": 66050000000000,
+ "fp-64": 206500000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "84.00.45.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia2": {
+ "compute_capability": "5.2",
+ "cores": 3072,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia2",
+ "memory": 12884901888,
+ "microarchitecture": "Maxwell",
+ "model": "GeForce GTX TITAN X",
+ "performance": {
+ "fp-16": 0,
+ "fp-32": 66050000000000,
+ "fp-64": 206500000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "84.00.45.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia3": {
+ "compute_capability": "5.2",
+ "cores": 3072,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia3",
+ "memory": 12884901888,
+ "microarchitecture": "Maxwell",
+ "model": "GeForce GTX TITAN X",
+ "performance": {
+ "fp-16": 0,
+ "fp-32": 66050000000000,
+ "fp-64": 206500000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "84.00.45.00.03",
+ "vendor": "Nvidia"
+ }
+ },
"main_memory": {
- "ram_size": 8
+ "ram_size": 51539607552
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +101,96 @@
},
"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_a3",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 8589934592,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x80000fae, 19.5.12",
"interface": "Ethernet",
"ip": "172.16.131.3",
"ip6": "2001:660:4406:800:4::3",
"kavlan": false,
"mac": "14:18:77:72:09:4c",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "esterel3-1.sophia.grid5000.fr",
"rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-6",
- "switch_port": "1/1/2"
+ "switch_port": "1/1/2",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "igb",
+ "enabled": false,
+ "firmware_version": "1.67, 0x80000fae, 19.5.12",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "14:18:77:72:09:4d",
+ "management": false,
+ "model": "I350 Gigabit Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.35.5100",
+ "guid": "0xe41d2d030050bc51",
+ "interface": "InfiniBand",
+ "ip": "172.18.131.3",
+ "kavlan": false,
+ "mac": "e4:1d:2d:03:00:50:bc:51",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "esterel3-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,32 +207,32 @@
],
"nodeset": "esterel3",
"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": 35200000000,
- "node_flops": 2534400000000
+ "node_flops": 704000000000
},
"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": 2200000000,
"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-2630 v4 @ 2.20GHz",
+ "vendor": "Intel",
+ "version": "E5-2630 v4"
},
"redfish": true,
"software": {
@@ -104,14 +242,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada",
"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 Adp",
+ "size": 1999307276288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -121,7 +260,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "esterel3-1"
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index f110944974920733a6b13274ddb4336583a2eac4..8365f2e7455b190a1b8f97fa1827416b7a8e91e7 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2244,6 +2244,12 @@ sites:
chassis:
manufactured_at: 2020-10-30
warranty_end: 2027-10-31
+ esterel3:
+ nodes:
+ esterel3-1:
+ chassis:
+ manufactured_at: 2016-06-06
+ warranty_end: 2021-06-06
esterel4:
nodes:
esterel4-1:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index bf76b1af44ded3e7abfc549561498bb0aeeb4153..1e8210b4134a0c89acc9c0e532533857b0ba7fb0 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -159,6 +159,7 @@ ipv4:
sophia esterel2 eth0 0 0 3 1
sophia esterel2 ib0 0 0 3 1
sophia esterel3 eth0 0 0 3 2
+ sophia esterel3 ib0 0 0 3 2
sophia esterel4 eth0 0 0 3 3
sophia esterel4 ib0 0 0 3 3
sophia esterel5 eth0 0 0 3 4
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
index 1aab8229d6986ba4fed3f0344b20b7f4e97440fc..90a02fbb166029bd68cc9f7d826d21cb2955b07d 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
@@ -9,9 +9,6 @@ queues:
- testing
nodes:
esterel3-1:
- chassis:
- manufactured_at: 2016-06-06
- warranty_end: 2021-06-06
supported_job_types:
deploy: true
besteffort: true
@@ -29,11 +26,14 @@ nodes:
enabled: true
mountable: true
mounted: true
+ eth1:
+ enabled: false
+ mountable: false
+ mounted: false
storage_devices:
- disk0: # This field will have to be renamed later.
+ pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..33f292f988c31e44947e80658d7d8194e9aadffe
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml
@@ -0,0 +1,9 @@
+---
+nodes:
+ esterel3-1:
+ network_adapters:
+ ib0:
+ enabled: true
+ mountable: true
+ mounted: true
+ netmask: 255.255.240.0
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb
deleted file mode 100644
index 9db36481640db24ecc13eafadc9c8d7215afd426..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb
+++ /dev/null
@@ -1,80 +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 = "esterel3"
- nodes_number = 1 # Size of the cluster (number of nodes)
- # MAC addresses declaration
- mac_eth0_list = %w(
-14:18:77:72:09:4c
- )
- mac_bmc_list = %w(
-14:18:77:72:09:4e
- )
-%>
----
-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: 1000000000 # 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
-<% } %>
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9ead050b211493a92c02503c09c5f7eed4eff64c
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
@@ -0,0 +1,142 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel3-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 20
+ nb_procs: 2
+ nb_threads: 40
+ platform_type: x86_64
+ bios:
+ release_date: 10/18/2023
+ vendor: Dell Inc.
+ version: 2.18.2
+ bmc_version: 2.85.85.85
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge T630
+ serial: DPSDDD2
+ gpu_devices:
+ nvidia0:
+ cpu_affinity: 0
+ device: "/dev/nvidia0"
+ memory: 12884901888
+ model: GeForce GTX TITAN X
+ power_default_limit: 250.00 W
+ vbios_version: 84.00.45.00.03
+ vendor: Nvidia
+ nvidia1:
+ cpu_affinity: 0
+ device: "/dev/nvidia1"
+ memory: 12884901888
+ model: GeForce GTX TITAN X
+ power_default_limit: 250.00 W
+ vbios_version: 84.00.45.00.03
+ vendor: Nvidia
+ nvidia2:
+ cpu_affinity: 1
+ device: "/dev/nvidia2"
+ memory: 12884901888
+ model: GeForce GTX TITAN X
+ power_default_limit: 250.00 W
+ vbios_version: 84.00.45.00.03
+ vendor: Nvidia
+ nvidia3:
+ cpu_affinity: 1
+ device: "/dev/nvidia3"
+ memory: 12884901888
+ model: GeForce GTX TITAN X
+ power_default_limit: 250.00 W
+ vbios_version: 84.00.45.00.03
+ vendor: Nvidia
+ main_memory:
+ ram_size: 51539607552
+ memory_devices:
+ dimm_a1:
+ size: 8589934592
+ technology: dram
+ dimm_a2:
+ size: 8589934592
+ technology: dram
+ dimm_a3:
+ size: 8589934592
+ technology: dram
+ dimm_b1:
+ size: 8589934592
+ technology: dram
+ dimm_b2:
+ size: 8589934592
+ technology: dram
+ dimm_b3:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.131.3
+ mac: 14:18:77:72:09:4e
+ management: true
+ eth0:
+ driver: igb
+ firmware_version: 1.67, 0x80000fae, 19.5.12
+ interface: Ethernet
+ ip: 172.16.131.3
+ mac: 14:18:77:72:09:4c
+ management: false
+ model: I350 Gigabit Network Connection
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ eth1:
+ driver: igb
+ firmware_version: 1.67, 0x80000fae, 19.5.12
+ interface: Ethernet
+ mac: 14:18:77:72:09:4d
+ management: false
+ model: I350 Gigabit Network Connection
+ name: eno2
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.35.5100
+ guid: '0xe41d2d030050bc51'
+ interface: InfiniBand
+ ip: 172.18.131.3
+ mac: e4:1d:2d:03:00:50:bc:51
+ 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: 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-2630 v4 @ 2.20GHz
+ vendor: Intel
+ version: E5-2630 v4
+ storage_devices:
+ pci-0000:03:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H730 Adp
+ size: 1999307276288
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index c96999dac0533b7f99795ec129a19fd97c4bd967..145cebec70dd1cab8889161bb0ee9de68bdeff7c 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -398,6 +398,10 @@ esterel1:
eno3: eth2
eno4: eth3
ibp131s0: ib0
+esterel3:
+ enp1s0f0np0: eth0
+ eno2: eth1
+ ibp130s0: ib0
esterel4:
enp1s0f0np0: eth0
eno2: eth1