diff --git a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json index 4671086449ea142b5e23e0ed30e425b4a95f31a4..4fc7c588b085041ea3372e56c258157d334b6baf 100644 --- a/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json +++ b/data/grid5000/sites/sophia/clusters/esterel1/esterel1.json @@ -1,9 +1,9 @@ { "boot_type": "uefi", - "created_at": "Thu, 13 Mar 2025 00:00:00 GMT", + "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", "exotic": false, "kavlan": false, - "manufactured_at": "2016-11-01", + "manufactured_at": "1970-01-01", "metrics": [ { "description": "Default subset of metrics from Prometheus Node Exporter", @@ -78,10 +78,10 @@ } } ], - "model": "Dell PowerEdge R730", + "model": "Cluster Model", "nodes_count": 1, "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": 201611, + "priority": 197001, "queues": [ "admin", "testing" @@ -89,5 +89,5 @@ "redfish": true, "type": "cluster", "uid": "esterel1", - "warranty_end": "2021-11-01" + "warranty_end": "1970-01-01" } \ No newline at end of file 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 00ccd88379d7ddd3cfd1bb424fce58f0863c8e3b..fc0477b7becef0a82cb1a07201fd289343ca0421 100644 --- a/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.json @@ -11,20 +11,20 @@ "vendor": "Dell Inc.", "version": "2.19.0" }, - "bmc_version": "2.86.86.86", + "bmc_version": "2.86", "chassis": { - "manufactured_at": "2016-11-01", + "manufactured_at": "1970-01-01", "manufacturer": "Dell Inc.", "name": "PowerEdge R730", "serial": "88Y9RG2", - "warranty_end": "2021-11-01" + "warranty_end": "1970-01-01" }, "exotic": false, "main_memory": { "ram_size": 34359738368 }, "management_tools": { - "bmc_vendor_tool": "racadm", + "bmc_vendor_tool": "ipmitool", "ipmitool": { "retries": 5 } @@ -78,15 +78,12 @@ { "device": "eth1", "driver": "tg3", - "enabled": false, "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", - "mountable": false, - "mounted": false, "name": "eno2", "sriov": false, "sriov_totalvfs": 0, @@ -95,15 +92,12 @@ { "device": "eth2", "driver": "tg3", - "enabled": false, "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", - "mountable": false, - "mounted": false, "name": "eno3", "sriov": false, "sriov_totalvfs": 0, @@ -112,15 +106,12 @@ { "device": "eth3", "driver": "tg3", - "enabled": false, "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", - "mountable": false, - "mounted": false, "name": "eno4", "sriov": false, "sriov_totalvfs": 0, @@ -169,8 +160,8 @@ "turboboost_enabled": true }, "performance": { - "core_flops": 16000000000, - "node_flops": 128000000000 + "core_flops": 128, + "node_flops": 1024 }, "processor": { "cache_l1": null, @@ -178,10 +169,10 @@ "cache_l1i": 32768, "cache_l2": 262144, "cache_l3": 10485760, - "clock_speed": 2000000000, + "clock_speed": 8, "ht_capable": true, "instruction_set": "x86-64", - "microarchitecture": "Sandy Bridge", + "microarchitecture": "Haswell", "microcode": "0xb000040", "model": "Intel Xeon", "other_description": "Intel(R) Xeon(R) CPU E5-2623 v4 @ 2.60GHz", diff --git a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml index f10d9bb4157481d46b6c3cf65a63f0bc5a967060..8999f20a787aa7077b2287969e4b6bd3e67e960b 100644 --- a/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel1/esterel1.yaml @@ -1,24 +1,24 @@ --- -model: Dell PowerEdge R730 -created_at: 2025-03-13 +model: Cluster Model # TODO: change this value. +created_at: 1970-01-01 # TODO: change this value kavlan: false -boot_type: uefi -exotic: false +boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice) +exotic: false # TODO: specify if 'true' or 'false' queues: - admin - testing nodes: esterel1-1: chassis: - manufactured_at: 2016-11-01 - warranty_end: 2021-11-01 + manufactured_at: 1970-01-01 # TODO: Put date. + warranty_end: 1970-01-01 # TODO: Put date. supported_job_types: deploy: true besteffort: true max_walltime: 0 processor: - microarchitecture: Sandy Bridge - clock_speed: 2000000000 + microarchitecture: Haswell # TODO: replace with microarch name. + clock_speed: 8 # TODO: Replace with clock speed. network_adapters: bmc: interface: Ethernet @@ -29,27 +29,17 @@ nodes: enabled: true mountable: true mounted: true - eth1: - enabled: false - mountable: false - mounted: false - eth2: - enabled: false - mountable: false - mounted: false - eth3: - enabled: false - mountable: false - mounted: false storage_devices: - pci-0000:03:00.0-scsi-0:2:0:0: + 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. 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" software: - standard-environment: debian11-x64-std + standard-environment: debian11-x64-std # TODO: check that architecture is OK management_tools: - bmc_vendor_tool: racadm + bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm) nodeset: esterel1 diff --git a/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml index 550cb30e48aa439ddace1a4c2025e158160e46db..74090dcbcc2913b76b77ba79259a23f5f176ee1b 100644 --- a/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel1/esterel1_ib.yaml @@ -5,4 +5,6 @@ nodes: 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/esterel1-1.yaml b/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml index 0857a243955a5146f64e80791aabad095bb7932a..e1eb832b0d13552dfb853055b97e708f1b960c51 100644 --- a/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel1/nodes/esterel1-1.yaml @@ -11,7 +11,7 @@ esterel1-1: release_date: 12/12/2023 vendor: Dell Inc. version: 2.19.0 - bmc_version: '2.86.86.86' + bmc_version: '2.86' chassis: manufacturer: Dell Inc. name: PowerEdge R730