From bfbfe087b000206b298351a0ae7743f5d273c64e Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 17 Mar 2025 11:10:21 +0100
Subject: [PATCH 01/18] [strasbourg][engelbourg] Update first description of
engelbourg cluster
---
.../clusters/engelbourg/engelbourg.json | 22 +++
.../engelbourg/nodes/engelbourg-1.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-2.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-3.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-4.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-5.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-6.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-7.json | 128 ++++++++++++++++++
.../engelbourg/nodes/engelbourg-8.json | 128 ++++++++++++++++++
input/grid5000/ipv4.yaml | 1 +
.../clusters/engelbourg/engelbourg.yaml | 41 ++++++
.../clusters/engelbourg/nodes.yaml.erb | 91 +++++++++++++
12 files changed, 1179 insertions(+)
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
create mode 100644 data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
new file mode 100644
index 00000000000..0f93f12de09
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
@@ -0,0 +1,22 @@
+{
+ "boot_type": "uefi",
+ "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "exotic": true,
+ "kavlan": false,
+ "manufactured_at": "1970-01-01",
+ "metrics": [
+
+ ],
+ "model": "Switch P4",
+ "nodes_count": 8,
+ "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
+ "priority": 197001,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "redfish": true,
+ "type": "cluster",
+ "uid": "engelbourg",
+ "warranty_end": "1970-01-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
new file mode 100644
index 00000000000..27823386baf
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.1",
+ "ip6": "2001:660:4406:a00:2::1",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0f:12",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-1.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.1",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:4c:fc",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-1-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
new file mode 100644
index 00000000000..a48569fb71e
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.2",
+ "ip6": "2001:660:4406:a00:2::2",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0f:39",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-2.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.2",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:3a:f0",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-2-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
new file mode 100644
index 00000000000..115e3f5a864
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.3",
+ "ip6": "2001:660:4406:a00:2::3",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0e:d7",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-3.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.3",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:36:04",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-3-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
new file mode 100644
index 00000000000..1689e2014c5
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.4",
+ "ip6": "2001:660:4406:a00:2::4",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0f:42",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-4.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.4",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:3c:08",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-4-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
new file mode 100644
index 00000000000..ac7a3575e5c
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.5",
+ "ip6": "2001:660:4406:a00:2::5",
+ "kavlan": false,
+ "mac": "00:90:fb:76:cd:89",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-5.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.5",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:4b:e4",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-5-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
new file mode 100644
index 00000000000..b2f53304cee
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.6",
+ "ip6": "2001:660:4406:a00:2::6",
+ "kavlan": false,
+ "mac": "00:90:fb:76:cd:8a",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-6.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.6",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:49:28",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-6-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
new file mode 100644
index 00000000000..bddd04c1fe0
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.7",
+ "ip6": "2001:660:4406:a00:2::7",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0f:38",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-7.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.7",
+ "kavlan": false,
+ "mac": "e0:01:a6:a4:3b:7c",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-7-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
new file mode 100644
index 00000000000..a30531f8b64
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "1970-01-01",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "1970-01-01"
+ },
+ "exotic": true,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.161.8",
+ "ip6": "2001:660:4406:a00:2::8",
+ "kavlan": false,
+ "mac": null,
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "engelbourg-8.strasbourg.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.161.8",
+ "kavlan": false,
+ "mac": null,
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "engelbourg-8-bmc.strasbourg.grid5000.fr"
+ }
+ ],
+ "nodeset": "engelbourg",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 25600000000,
+ "node_flops": 1843200000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 1600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Broadwell",
+ "microcode": "0xd000001",
+ "model": "Unknown",
+ "other_description": "description",
+ "vendor": "vendor",
+ "version": "vendor"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "engelbourg-8"
+}
\ No newline at end of file
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 065360bfe14..b0d67817a73 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -219,6 +219,7 @@ ipv4:
strasbourg fleckenstein eth0 0 0 0 0
strasbourg fleckenstein eth1 0 0 0 10
strasbourg fleckenstein eth2 0 0 0 20
+ strasbourg engelbourg eth0 0 0 1 0
toulouse montcalm eth0 0 0 8 0
toulouse estats eth0 0 0 9 0
louvain spirou eth0 0 0 0 0
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
new file mode 100644
index 00000000000..4d4aea069e5
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -0,0 +1,41 @@
+---
+model: Switch P4
+created_at: 1970-01-01 # TODO: change this value
+kavlan: false
+boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
+exotic: true
+queues:
+ - admin
+ - testing
+nodes:
+ engelbourg-[1-8]:
+ chassis:
+ 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: Broadwell
+ clock_speed: 1600000000
+ network_adapters:
+ bmc:
+ enabled: true
+ mountable: false
+ mounted: false
+ eth0:
+ enabled: true
+ mountable: true
+ mounted: true
+ storage_devices:
+ disk0: # This field will have to be renamed later.
+ id: disk0
+ interface: SAS
+ by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+ software:
+ standard-environment: debian11-x64-std # TODO: check that architecture is OK
+ management_tools:
+ bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ nodeset: engelbourg # TODO: rename cluster
+
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
new file mode 100644
index 00000000000..22980ed3989
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
@@ -0,0 +1,91 @@
+<%
+ cluster_name = "engelbourg"
+ nodes_number = 8 #
+ # MAC addresses declaration
+ mac_eth0_list = %w(
+ 00:90:FB:78:0F:12
+ 00:90:FB:78:0F:39
+ 00:90:FB:78:0E:D7
+ 00:90:FB:78:0F:42
+ 00:90:FB:76:CD:89
+ 00:90:FB:76:CD:8A
+ 00:90:FB:78:0F:38
+ )
+
+ mac_bmc_list = %w(
+ E0:01:A6:A4:4C:FC
+ E0:01:A6:A4:3A:F0
+ E0:01:A6:A4:36:04
+ E0:01:A6:A4:3C:08
+ E0:01:A6:A4:4B:E4
+ E0:01:A6:A4:49:28
+ E0:01:A6:A4:3B:7C
+ )
+%>
+---
+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] %>
+ eth0:
+ interface: Ethernet
+ management: false
+ driver: mlx_core
+ name: enp1s0f0np0 # Replace with primary interface name
+ rate: 10000000000
+ mac: <%= mac_eth0_list[i - 1] %>
+ 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
+<% } %>
--
GitLab
From 57ed49a235cd25b32581a4e43b54a9f8bd8b6751 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 17 Mar 2025 17:28:32 +0100
Subject: [PATCH 02/18] [strasbourg][engelbourg] Update disk path of engelbourg
cluster devices
---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-1.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-2.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-3.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-4.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-5.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-6.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-7.json | 6 +++---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-8.json | 6 +++---
.../sites/strasbourg/clusters/engelbourg/engelbourg.yaml | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 27823386baf..936d8aaa9f8 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index a48569fb71e..4d2b7190b93 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-2.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet44"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 115e3f5a864..a4428167c5a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-3.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet56"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 1689e2014c5..064bb258c2e 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-4.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet68"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index ac7a3575e5c..f3afd881040 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-5.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet80"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index b2f53304cee..f18d67d7139 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-6.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet92"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index bddd04c1fe0..e4d8a5a0a3b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-7.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet104"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index a30531f8b64..b68dfce5ea9 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "engelbourg-8.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-core-adm",
+ "switch_port": "Ethernet116"
},
{
"device": "bmc",
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
index 4d4aea069e5..26338b6b94a 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -32,7 +32,7 @@ nodes:
disk0: # This field will have to be renamed later.
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
software:
standard-environment: debian11-x64-std # TODO: check that architecture is OK
management_tools:
--
GitLab
From ae181faa78f4cf5265bf3f5b985f88f5671cb7c4 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 17 Mar 2025 18:11:31 +0100
Subject: [PATCH 03/18] [strasbourg][engelbourg] Fix primary network interface
---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-1.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-2.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-3.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-4.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-5.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-6.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-7.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-8.json | 2 +-
.../sites/strasbourg/clusters/engelbourg/nodes.yaml.erb | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 936d8aaa9f8..2ab14637065 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-1.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": null,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 4d2b7190b93..cf9adb26ae8 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-2.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index a4428167c5a..007b100d8f4 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-3.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 064bb258c2e..8b6321f149a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-4.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index f3afd881040..cac9fa38f91 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-5.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index f18d67d7139..570d49e5ebe 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-6.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index e4d8a5a0a3b..027df9975b5 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-7.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index b68dfce5ea9..3d8d7e1badd 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -48,7 +48,7 @@
"management": false,
"mountable": true,
"mounted": true,
- "name": "enp1s0f0np0",
+ "name": "enp2s0",
"network_address": "engelbourg-8.strasbourg.grid5000.fr",
"rate": 10000000000,
"switch": "sw-core-adm",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
index 22980ed3989..3f71a210ec9 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
@@ -80,7 +80,7 @@ nodes:
interface: Ethernet
management: false
driver: mlx_core
- name: enp1s0f0np0 # Replace with primary interface name
+ name: enp2s0 # Replace with primary interface name
rate: 10000000000
mac: <%= mac_eth0_list[i - 1] %>
storage_devices:
--
GitLab
From 1719bd3d52267ff2beb53d679a3d1a9fd340f60b Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 13:45:09 +0100
Subject: [PATCH 04/18] [strasbourg][engelbourg] Add predictable interface
mapping
---
lib/refrepo/net_names_mapping.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 4060764d810..521518ed14e 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -133,6 +133,10 @@ ecotype:
eno2: eth1
eno3: eth2
eno4: eth3
+engelbourg:
+ enp2s0: eth0
+ enp4s0f0: eth1
+ enp4s0f1: eth2
fleckenstein:
ens10f0: eth0
ens10f1: eth1
--
GitLab
From 774901e78098d91b145aa194e25a332426245170 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 15:12:42 +0100
Subject: [PATCH 05/18] [strasbourg][engelbourg] Add rake reference-api
generated file
---
.../engelbourg/nodes/engelbourg-1.json | 2 +-
.../engelbourg/nodes/engelbourg-2.json | 2 +-
.../engelbourg/nodes/engelbourg-3.json | 2 +-
.../engelbourg/nodes/engelbourg-4.json | 2 +-
.../engelbourg/nodes/engelbourg-5.json | 2 +-
.../engelbourg/nodes/engelbourg-6.json | 2 +-
.../engelbourg/nodes/engelbourg-7.json | 2 +-
.../engelbourg/nodes/engelbourg-8.json | 2 +-
.../fleckenstein/nodes/fleckenstein-1.json | 4 +-
.../fleckenstein/nodes/fleckenstein-10.json | 4 +-
.../fleckenstein/nodes/fleckenstein-2.json | 4 +-
.../fleckenstein/nodes/fleckenstein-3.json | 4 +-
.../fleckenstein/nodes/fleckenstein-4.json | 4 +-
.../fleckenstein/nodes/fleckenstein-5.json | 4 +-
.../fleckenstein/nodes/fleckenstein-6.json | 4 +-
.../fleckenstein/nodes/fleckenstein-7.json | 4 +-
.../fleckenstein/nodes/fleckenstein-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-9.json | 4 +-
.../strasbourg/network_equipments/gw.json | 143 ++++--------------
19 files changed, 60 insertions(+), 139 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 2ab14637065..1869ca624d7 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index cf9adb26ae8..6512c33a7e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 007b100d8f4..b2c2826b2d2 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 8b6321f149a..582850b7cbf 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index cac9fa38f91..c4eef7004e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 570d49e5ebe..f62ffc8e616 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 027df9975b5..0be3085d407 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index 3d8d7e1badd..5e0a6e5f72f 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index e54ae287433..e767ad76647 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet6",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 57c21d16936..b3be77f3ab9 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet33",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index a432f0e2426..c58417b201d 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet9",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 63349973ae5..a5959e8beec 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet12",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index e323ddf7978..cbfc12b86d5 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet15",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 7ac10a30879..adbd0d1e987 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet18",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index b90e4fac263..7fc8578f191 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet21",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 9db29772b70..3c39d06cb5b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet24",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet26",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 016220cf643..b12871d93e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet27",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 10879d0b756..e5da0deae93 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet30",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 2e8e0b056b2..10ff5e05eff 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -2,14 +2,6 @@
"alias": [
"gw-strasbourg"
],
- "channels": {
- "port-channel1": {
- "kind": "server",
- "port": "port-channel1",
- "rate": 50000000000,
- "uid": "srv-data"
- }
- },
"ip": "172.16.175.254",
"ip6": "2001:660:4406:a00::ffff:ffff",
"kind": "router",
@@ -21,177 +13,106 @@
"kind": "node",
"ports": [
{
- "kind": "channel",
+ "kind": "node",
+ "port": "strasbourg",
"snmp_name": "Ethernet0",
- "uid": "port-channel1"
+ "uid": "dev"
},
{
- "kind": "channel",
+ "kind": "node",
+ "port": "apornet",
"snmp_name": "Ethernet1",
- "uid": "port-channel1"
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet2",
- "uid": "pve-1"
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet3",
- "uid": "pve-2"
- },
- {
- },
- {
+ "uid": "dev"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet6",
- "uid": "fleckenstein-1"
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet8",
- "uid": "fleckenstein-1"
+ "snmp_name": "Ethernet2",
+ "uid": "stonet-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet9",
- "uid": "fleckenstein-2"
- },
- {
+ "snmp_name": "Ethernet3",
+ "uid": "ibat-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet11",
- "uid": "fleckenstein-2"
+ "port": "net",
+ "snmp_name": "Ethernet4",
+ "uid": "wiki"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet12",
- "uid": "fleckenstein-3"
- },
- {
+ "snmp_name": "Ethernet5",
+ "uid": "strasbourg-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet14",
- "uid": "fleckenstein-3"
+ "port": "www",
+ "snmp_name": "Ethernet6",
+ "uid": "dev"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet15",
- "uid": "fleckenstein-4"
+ "snmp_name": "Ethernet7",
+ "uid": "soknet-1"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet17",
- "uid": "fleckenstein-4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet18",
- "uid": "fleckenstein-5"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet20",
- "uid": "fleckenstein-5"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet21",
- "uid": "fleckenstein-6"
},
{
},
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet23",
- "uid": "fleckenstein-6"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet24",
- "uid": "fleckenstein-7"
- },
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet26",
- "uid": "fleckenstein-7"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet27",
- "uid": "fleckenstein-8"
},
{
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet29",
- "uid": "fleckenstein-8"
+ "port": "RENATER",
+ "snmp_name": "Ethernet19",
+ "uid": "PE"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet30",
- "uid": "fleckenstein-9"
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet32",
- "uid": "fleckenstein-9"
+ "snmp_name": "Ethernet20",
+ "uid": "p4-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet33",
- "uid": "fleckenstein-10"
- },
- {
+ "snmp_name": "Ethernet21",
+ "uid": "p4-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet35",
- "uid": "fleckenstein-10"
+ "port": "icube",
+ "snmp_name": "Ethernet22",
+ "uid": "pfsense"
}
],
- "rate": 25000000000,
+ "rate": 10000000000,
"snmp_pattern": "Ethernet%PORT%"
}
],
"managed_by_us": true,
- "model": "wedge100bf_32x",
- "serial": "AM26029251",
+ "model": "Juniper EX4600-40F",
"site": "strasbourg",
"snmp_community": "Unknown",
"type": "network_equipment",
--
GitLab
From bf9edf53fa688a052c35695d583e5d5bc63587e4 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:32:32 +0100
Subject: [PATCH 06/18] [strasbourg][engelbourg] g5k-checks import
---
.../engelbourg/nodes/engelbourg-1.json | 81 ++++++------
.../engelbourg/nodes/engelbourg-2.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-3.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-4.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-5.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-6.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-7.json | 83 +++++++------
.../engelbourg/nodes/engelbourg-8.json | 116 ++++++++++++------
.../engelbourg/nodes/engelbourg-1.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-2.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-3.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-4.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-5.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-6.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-7.yaml | 65 ++++++++++
.../engelbourg/nodes/engelbourg-8.yaml | 89 ++++++++++++++
16 files changed, 936 insertions(+), 303 deletions(-)
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
create mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 1869ca624d7..39fff66bc94 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.1",
"ip6": "2001:660:4406:a00:2::1",
"kavlan": false,
- "mac": "00:90:fb:78:0f:12",
+ "mac": "00:90:fb:78:0f:7a",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-1.strasbourg.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.1",
"kavlan": false,
- "mac": "e0:01:a6:a4:4c:fc",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-1"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 6512c33a7e1..15c00df06ba 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.2",
"ip6": "2001:660:4406:a00:2::2",
"kavlan": false,
- "mac": "00:90:fb:78:0f:39",
+ "mac": "00:90:fb:78:0f:12",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-2.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet44"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet44",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.2",
"kavlan": false,
- "mac": "e0:01:a6:a4:3a:f0",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-2"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index b2c2826b2d2..8a9eb90d082 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.3",
"ip6": "2001:660:4406:a00:2::3",
"kavlan": false,
- "mac": "00:90:fb:78:0e:d7",
+ "mac": "00:90:fb:78:0f:39",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-3.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet56"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet56",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.3",
"kavlan": false,
- "mac": "e0:01:a6:a4:36:04",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-3"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 582850b7cbf..3d8fb01e747 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.4",
"ip6": "2001:660:4406:a00:2::4",
"kavlan": false,
- "mac": "00:90:fb:78:0f:42",
+ "mac": "00:90:fb:78:0e:d7",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-4.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet68"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet68",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.4",
"kavlan": false,
- "mac": "e0:01:a6:a4:3c:08",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-4"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index c4eef7004e1..3cd82abc1f8 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.5",
"ip6": "2001:660:4406:a00:2::5",
"kavlan": false,
- "mac": "00:90:fb:76:cd:89",
+ "mac": "00:90:fb:78:0f:42",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-5.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet80"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet80",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.5",
"kavlan": false,
- "mac": "e0:01:a6:a4:4b:e4",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-5"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index f62ffc8e616..5e07873dd58 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.6",
"ip6": "2001:660:4406:a00:2::6",
"kavlan": false,
- "mac": "00:90:fb:76:cd:8a",
+ "mac": "00:90:fb:76:cd:89",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-6.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet92"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet92",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.6",
"kavlan": false,
- "mac": "e0:01:a6:a4:49:28",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-6"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 0be3085d407..b9ca5c2f5df 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,34 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.7",
"ip6": "2001:660:4406:a00:2::7",
"kavlan": false,
- "mac": "00:90:fb:78:0f:38",
+ "mac": "00:90:fb:76:cd:8a",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-7.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet104"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet104",
+ "vendor": "Intel"
},
{
"device": "bmc",
@@ -60,7 +66,6 @@
"interface": "Ethernet",
"ip": "172.17.161.7",
"kavlan": false,
- "mac": "e0:01:a6:a4:3b:7c",
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +74,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +109,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +127,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-7"
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index 5e0a6e5f72f..3da0f4933ad 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -1,26 +1,27 @@
{
"architecture": {
"cpu_core_numbering": "contiguous",
- "nb_cores": 72,
+ "nb_cores": 4,
"nb_procs": 1,
- "nb_threads": 72,
+ "nb_threads": 8,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "02/08/2021",
+ "vendor": "American Megatrends Inc.",
+ "version": "R1.00.E4"
},
- "bmc_version": "v1",
+ "bmc_version": "15.00",
"chassis": {
"manufactured_at": "1970-01-01",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Default string",
+ "name": "Default string",
+ "serial": "Default string",
"warranty_end": "1970-01-01"
},
"exotic": true,
"main_memory": {
- "ram_size": 8
+ "ram_size": 8589934592
},
"management_tools": {
"bmc_vendor_tool": "ipmitool",
@@ -30,29 +31,67 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "sodimm_a1",
+ "size": 8589934592,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "3.16.0",
"interface": "Ethernet",
"ip": "172.16.161.8",
"ip6": "2001:660:4406:a00:2::8",
"kavlan": false,
- "mac": null,
+ "mac": "00:90:fb:78:0f:38",
"management": false,
+ "model": "I210 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp2s0",
"network_address": "engelbourg-8.strasbourg.grid5000.fr",
- "rate": 10000000000,
- "switch": "sw-core-adm",
- "switch_port": "Ethernet116"
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-core",
+ "switch_port": "Ethernet116",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0b:4e",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:90:fb:78:0b:4f",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "02:00:00:00:00:02",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
},
{
"device": "bmc",
@@ -60,7 +99,6 @@
"interface": "Ethernet",
"ip": "172.17.161.8",
"kavlan": false,
- "mac": null,
"management": true,
"mountable": false,
"mounted": false,
@@ -69,32 +107,32 @@
],
"nodeset": "engelbourg",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": false
},
"performance": {
"core_flops": 25600000000,
- "node_flops": 1843200000000
+ "node_flops": 102400000000
},
"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": 6291456,
"clock_speed": 1600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Broadwell",
- "microcode": "0xd000001",
- "model": "Unknown",
- "other_description": "description",
- "vendor": "vendor",
- "version": "vendor"
+ "microcode": "0x700001c",
+ "model": "Intel(R) Pentium(R)",
+ "other_description": "Intel(R) Pentium(R) CPU D1517 @ 1.60GHz",
+ "vendor": "Intel",
+ "version": "D1517"
},
"redfish": true,
"software": {
@@ -104,14 +142,15 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a",
"by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
+ "firmware_version": "L17606",
"id": "disk0",
- "interface": "SAS",
- "model": "unknown",
- "size": 8,
+ "interface": "SATA",
+ "model": "M.2 (S80) 3ME4",
+ "size": 128035676160,
"storage": "SSD",
- "vendor": "Unknown"
+ "vendor": "Innodisk"
}
],
"supported_job_types": {
@@ -121,7 +160,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "engelbourg-8"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
new file mode 100644
index 00000000000..4c8c51be1d4
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-1:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.1
+ mac: 00:90:fb:78:0f:7a
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
new file mode 100644
index 00000000000..e32b94af085
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-2:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.2
+ mac: 00:90:fb:78:0F:12
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
new file mode 100644
index 00000000000..e3d8dbf6058
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-3:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.3
+ mac: 00:90:fb:78:0F:39
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
new file mode 100644
index 00000000000..4a608e1e676
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-4:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.4
+ mac: 00:90:fb:78:0E:D7
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
new file mode 100644
index 00000000000..7d317533214
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-5:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.5
+ mac: 00:90:FB:78:0F:42
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
new file mode 100644
index 00000000000..915da906a77
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-6:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.6
+ mac: 00:90:fb:76:cd:89
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
new file mode 100644
index 00000000000..d8d20ebc58f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -0,0 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-7:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.7
+ mac: 00:90:fb:76:cd:8a
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
new file mode 100644
index 00000000000..3f654ffdd06
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
@@ -0,0 +1,89 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+engelbourg-8:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 4
+ nb_procs: 1
+ nb_threads: 8
+ platform_type: x86_64
+ bios:
+ release_date: 02/08/2021
+ vendor: American Megatrends Inc.
+ version: R1.00.E4
+ bmc_version: '15.00'
+ chassis:
+ manufacturer: Default string
+ name: Default string
+ serial: Default string
+ main_memory:
+ ram_size: 8589934592
+ memory_devices:
+ sodimm_a1:
+ size: 8589934592
+ technology: dram
+ network_adapters:
+ eth0:
+ driver: igb
+ firmware_version: 3.16.0
+ interface: Ethernet
+ ip: 172.16.161.8
+ mac: 00:90:fb:78:0f:38
+ management: false
+ model: I210 Gigabit Network Connection
+ name: enp2s0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 00:90:fb:78:0b:4e
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 00:90:fb:78:0b:4f
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 02:00:00:00:00:02
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: false
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 6291456
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x700001c'
+ other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
+ vendor: Intel
+ storage_devices:
+ pci-0000:00:1f.2-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
+ by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ firmware_version: L17606
+ model: M.2 (S80) 3ME4
+ size: 128035676160
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
--
GitLab
From 9efc664765be094cbfd351baa1c32f4f2be6fa68 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:33:13 +0100
Subject: [PATCH 07/18] [strasbourg][engelbourg] Add new disk model for
engelbourg
---
input/grid5000/disks.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index c8a47747f98..4505010cdd0 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -148,6 +148,8 @@ disk_vendor_model_mapping:
Lenovo:
- SSDSC2KG480GZL
- ST4000NM000A
+ Innodisk:
+ - M.2 (S80) 3ME4
Unknown:
- unknown
--
GitLab
From 85c238a67b0fe2c299b481f92609e85d348ae37b Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:34:00 +0100
Subject: [PATCH 08/18] [strasbourg][engelbourg] Delete nodes.yaml.erb file
---
.../clusters/engelbourg/nodes.yaml.erb | 91 -------------------
1 file changed, 91 deletions(-)
delete mode 100644 input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
deleted file mode 100644
index 3f71a210ec9..00000000000
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes.yaml.erb
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
- cluster_name = "engelbourg"
- nodes_number = 8 #
- # MAC addresses declaration
- mac_eth0_list = %w(
- 00:90:FB:78:0F:12
- 00:90:FB:78:0F:39
- 00:90:FB:78:0E:D7
- 00:90:FB:78:0F:42
- 00:90:FB:76:CD:89
- 00:90:FB:76:CD:8A
- 00:90:FB:78:0F:38
- )
-
- mac_bmc_list = %w(
- E0:01:A6:A4:4C:FC
- E0:01:A6:A4:3A:F0
- E0:01:A6:A4:36:04
- E0:01:A6:A4:3C:08
- E0:01:A6:A4:4B:E4
- E0:01:A6:A4:49:28
- E0:01:A6:A4:3B:7C
- )
-%>
----
-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] %>
- eth0:
- interface: Ethernet
- management: false
- driver: mlx_core
- name: enp2s0 # Replace with primary interface name
- rate: 10000000000
- mac: <%= mac_eth0_list[i - 1] %>
- 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
-<% } %>
--
GitLab
From 975c7b3306529ae4161b2e184a5e63fba208bfcc Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:35:59 +0100
Subject: [PATCH 09/18] [strasbourg][engelbourg] Add short modif on disk, proc
and network description
---
.../strasbourg/clusters/engelbourg/engelbourg.json | 2 +-
.../strasbourg/clusters/engelbourg/engelbourg.yaml | 11 +++++++----
lib/refrepo/net_names_mapping.yaml | 1 +
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
index 0f93f12de09..276e0b68165 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.json
@@ -9,7 +9,7 @@
],
"model": "Switch P4",
"nodes_count": 8,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
+ "nodes_description": "1 CPU Intel(R) Pentium(R) D1517, 4 cores/CPU, 8GB RAM, 119GB SSD, 1 x 1Gb Ethernet",
"priority": 197001,
"queues": [
"admin",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
index 26338b6b94a..fd786493f96 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -18,9 +18,13 @@ nodes:
max_walltime: 0
processor:
microarchitecture: Broadwell
- clock_speed: 1600000000
+ clock_speed: 1600000000
+ model: Intel(R) Pentium(R)
+ version: D1517
network_adapters:
bmc:
+ interface: Ethernet
+ management: true
enabled: true
mountable: false
mounted: false
@@ -29,10 +33,9 @@ nodes:
mountable: true
mounted: true
storage_devices:
- disk0: # This field will have to be renamed later.
+ pci-0000:00:1f.2-ata-1:
id: disk0
- interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
+ interface: SATA
software:
standard-environment: debian11-x64-std # TODO: check that architecture is OK
management_tools:
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 521518ed14e..4d757b23626 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -137,6 +137,7 @@ engelbourg:
enp2s0: eth0
enp4s0f0: eth1
enp4s0f1: eth2
+ enx020000000002: eth3
fleckenstein:
ens10f0: eth0
ens10f1: eth1
--
GitLab
From 9f3e969a7b665683f99ab5b91209eb9d293fa873 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 09:23:38 +0100
Subject: [PATCH 10/18] [strasbourg][network] Add updated sw-admin and sw-core
yaml file
---
.../engelbourg/nodes/engelbourg-1.json | 4 +-
.../fleckenstein/nodes/fleckenstein-1.json | 4 +-
.../fleckenstein/nodes/fleckenstein-10.json | 4 +-
.../fleckenstein/nodes/fleckenstein-2.json | 4 +-
.../fleckenstein/nodes/fleckenstein-3.json | 4 +-
.../fleckenstein/nodes/fleckenstein-4.json | 4 +-
.../fleckenstein/nodes/fleckenstein-5.json | 4 +-
.../fleckenstein/nodes/fleckenstein-6.json | 4 +-
.../fleckenstein/nodes/fleckenstein-7.json | 4 +-
.../fleckenstein/nodes/fleckenstein-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-9.json | 4 +-
.../network_equipments/sw-admin.json | 247 ++++++++++
.../network_equipments/sw-core.json | 465 ++++++++++++++++++
.../sites/strasbourg/networks/sw-admin.yaml | 49 ++
.../sites/strasbourg/networks/sw-core.yaml | 109 ++++
15 files changed, 892 insertions(+), 22 deletions(-)
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-core.json
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-admin.yaml
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-core.yaml
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 39fff66bc94..fe2c97163c5 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-admin",
+ "switch_port": "Ethernet21",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index e767ad76647..ea9457f128e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet6",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index b3be77f3ab9..03ff387febd 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet33",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index c58417b201d..b718ba2e671 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet9",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index a5959e8beec..ddfe08170d6 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet12",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index cbfc12b86d5..7106f7b8bc0 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet15",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index adbd0d1e987..bf55890f627 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet18",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index 7fc8578f191..9fb384e36a2 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet21",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 3c39d06cb5b..f6c2cb80161 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet24",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet26",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index b12871d93e1..495566f21ae 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet27",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index e5da0deae93..fff418e2bd6 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet30",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
new file mode 100644
index 00000000000..2adf8ce2c04
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,247 @@
+{
+ "ip": "172.16.175.253",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ "kind": "node",
+ "port": "data",
+ "snmp_name": "Ethernet0",
+ "uid": "srv"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet1",
+ "uid": "pve-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet2",
+ "uid": "pve-2"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet3",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet4",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet5",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet6",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet7",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet8",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet9",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet10",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet11",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet12",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet13",
+ "uid": "engelbourg-2"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet14",
+ "uid": "engelbourg-3"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet15",
+ "uid": "engelbourg-4"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet16",
+ "uid": "engelbourg-5"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet17",
+ "uid": "engelbourg-6"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet18",
+ "uid": "engelbourg-7"
+ },
+ {
+ "kind": "node",
+ "port": "bmc",
+ "snmp_name": "Ethernet19",
+ "uid": "engelbourg-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet20",
+ "uid": "ramstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet21",
+ "uid": "engelbourg-1"
+ },
+ {
+ "kind": "node",
+ "port": "devstrasbourg-bmc",
+ "snmp_name": "Ethernet22",
+ "uid": "iotlab"
+ },
+ {
+ "kind": "node",
+ "port": "devaportnet-bmc",
+ "snmp_name": "Ethernet23",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "stonet-bmc",
+ "snmp_name": "Ethernet24",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "ibat-bmc",
+ "snmp_name": "Ethernet25",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "wikinet-bmc",
+ "snmp_name": "Ethernet26",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "soknet-bmc",
+ "snmp_name": "Ethernet27",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "strasbourg-bmc",
+ "snmp_name": "Ethernet28",
+ "uid": "iotlab"
+ },
+ {
+ "kind": "node",
+ "port": "devwww-bmc",
+ "snmp_name": "Ethernet29",
+ "uid": "iotlab"
+ },
+ {
+ "kind": "node",
+ "port": "www-bmc",
+ "snmp_name": "Ethernet30",
+ "uid": "iotlab"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "Ethernet48",
+ "uid": "sw-core"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "Ethernet%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "unknown",
+ "site": "strasbourg",
+ "snmp_community": "Unknown",
+ "type": "network_equipment",
+ "uid": "sw-admin"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
new file mode 100644
index 00000000000..f7e9479217c
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,465 @@
+{
+ "alias": [
+ "engelbourg-1"
+ ],
+ "channels": {
+ "port-channel1": {
+ "kind": "server",
+ "port": "port-channel1",
+ "rate": 50000000000,
+ "uid": "srv-data"
+ }
+ },
+ "ip": "172.16.175.252",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ "kind": "channel",
+ "snmp_name": "Ethernet0",
+ "uid": "port-channel1"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "Ethernet1",
+ "uid": "port-channel1"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "Ethernet2",
+ "uid": "pve-1"
+ },
+ {
+ "kind": "server",
+ "snmp_name": "Ethernet3",
+ "uid": "pve-2"
+ },
+ {
+ "kind": "node",
+ "port": "sw1-eth0",
+ "snmp_name": "Ethernet4",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "sw1-eth1",
+ "snmp_name": "Ethernet5",
+ "uid": "inetlab"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet6",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet7",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet8",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet9",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet10",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet11",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet12",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet13",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet14",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet15",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet16",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet17",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet18",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet19",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet20",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet21",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet22",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet23",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet24",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet25",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet26",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet27",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet28",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet29",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet30",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet31",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet32",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet33",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet34",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet35",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "Ethernet36",
+ "uid": "sw-admin"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet40",
+ "uid": "ramstein-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet44",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet56",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet68",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet80",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet92",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet104",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet116",
+ "uid": "engelbourg-8"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ }
+ ],
+ "rate": 25000000000,
+ "snmp_pattern": "Ethernet%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "wedge100bf_32x",
+ "site": "strasbourg",
+ "snmp_community": "Unknown",
+ "type": "network_equipment",
+ "uid": "sw-core"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
new file mode 100644
index 00000000000..7164b511f91
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,49 @@
+---
+sw-admin:
+ model: unknown
+ ip: 172.16.175.253
+ kind: switch
+ managed_by_us: true
+ snmp_community: Unknown
+ site: strasbourg
+ linecards:
+ 1:
+ rate: 1000000000
+ snmp_pattern: "Ethernet%PORT%"
+ kavlan_pattern: "%PORT%"
+ kind: node
+ ports:
+ 0: srv-data
+ 1: pve-1
+ 2: pve-2
+ 3: fleckenstein-1-bmc
+ 4: fleckenstein-2-bmc
+ 5: fleckenstein-3-bmc
+ 6: fleckenstein-4-bmc
+ 7: fleckenstein-5-bmc
+ 8: fleckenstein-6-bmc
+ 9: fleckenstein-7-bmc
+ 10: fleckenstein-8-bmc
+ 11: fleckenstein-9-bmc
+ 12: fleckenstein-10-bmc
+ 13: engelbourg-2-bmc
+ 14: engelbourg-3-bmc
+ 15: engelbourg-4-bmc
+ 16: engelbourg-5-bmc
+ 17: engelbourg-6-bmc
+ 18: engelbourg-7-bmc
+ 19: engelbourg-8-bmc
+ 20: ramstein-1
+ 21: engelbourg-1
+ 22: iotlab-devstrasbourg-bmc
+ 23: inetlab-devaportnet-bmc
+ 24: inetlab-stonet-bmc
+ 25: inetlab-ibat-bmc
+ 26: inetlab-wikinet-bmc
+ 27: inetlab-soknet-bmc
+ 28: iotlab-strasbourg-bmc
+ 29: iotlab-devwww-bmc
+ 30: iotlab-www-bmc
+ 48:
+ uid: sw-core
+ kind: switch
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
new file mode 100644
index 00000000000..82e22b7af23
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,109 @@
+---
+sw-core:
+ model: wedge100bf_32x
+ ip: 172.16.175.252
+ #TODO
+ #ip6: 2001:660:4406:a00::ffff:ffff
+ kind: switch
+ managed_by_us: true
+ snmp_community: Unknown
+ alias:
+ - engelbourg-1
+ site: strasbourg
+ linecards:
+ 1:
+ rate: 25000000000
+ snmp_pattern: "Ethernet%PORT%"
+ kavlan_pattern: "%PORT%"
+ kind: node
+ ports:
+ 0:
+ uid: port-channel1
+ kind: channel
+ 1:
+ uid: port-channel1
+ kind: channel
+ 2:
+ uid: pve-1
+ kind: server
+ 3:
+ uid: pve-2
+ kind: server
+ 4: inetlab-sw1-eth0
+ 5: inetlab-sw1-eth1
+ 6: fleckenstein-1-eth0
+ 7: fleckenstein-1-eth1
+ 8: fleckenstein-1-eth2
+ 9: fleckenstein-2-eth0
+ 10: fleckenstein-2-eth1
+ 11: fleckenstein-2-eth2
+ 12: fleckenstein-3-eth0
+ 13: fleckenstein-3-eth1
+ 14: fleckenstein-3-eth2
+ 15: fleckenstein-4-eth0
+ 16: fleckenstein-4-eth1
+ 17: fleckenstein-4-eth2
+ 18: fleckenstein-5-eth0
+ 19: fleckenstein-5-eth1
+ 20: fleckenstein-5-eth2
+ 21: fleckenstein-6-eth0
+ 22: fleckenstein-6-eth1
+ 23: fleckenstein-6-eth2
+ 24: fleckenstein-7-eth0
+ 25: fleckenstein-7-eth1
+ 26: fleckenstein-7-eth2
+ 27: fleckenstein-8-eth0
+ 28: fleckenstein-8-eth1
+ 29: fleckenstein-8-eth2
+ 30: fleckenstein-9-eth0
+ 31: fleckenstein-9-eth1
+ 32: fleckenstein-9-eth2
+ 33: fleckenstein-10-eth0
+ 34: fleckenstein-10-eth1
+ 35: fleckenstein-10-eth2
+ 36:
+ uid: sw-admin
+ kind: switch
+ 40: ramstein-1
+ 44:
+ uid: engelbourg-2-eth0
+ rate: 1000000000
+ 48:
+ 52:
+ 56:
+ uid: engelbourg-3-eth0
+ rate: 1000000000
+ 60:
+ 64:
+ 68:
+ uid: engelbourg-4-eth0
+ rate: 1000000000
+ 72:
+ 76:
+ 80:
+ uid: engelbourg-5-eth0
+ rate: 1000000000
+ 84:
+ 88:
+ 92:
+ uid: engelbourg-6-eth0
+ rate: 1000000000
+ 96:
+ 100:
+ 104:
+ uid: engelbourg-7-eth0
+ rate: 1000000000
+ 108:
+ 112:
+ 116:
+ uid: engelbourg-8-eth0
+ rate: 1000000000
+ 120:
+ 124:
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: srv-data
+ rate: 50000000000
+ kind: server
+
--
GitLab
From e39dcfd0d181ecb7830f279c45c35b6491d73738 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 10:13:33 +0100
Subject: [PATCH 11/18] [strasbourg][engelbourg] Fix valid homogeneity
---
.../engelbourg/nodes/engelbourg-1.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-2.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-3.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-4.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-5.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-6.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-7.json | 33 +++++++++++++++++++
.../engelbourg/nodes/engelbourg-1.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-2.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-3.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-4.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-5.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-6.yaml | 24 ++++++++++++++
.../engelbourg/nodes/engelbourg-7.yaml | 24 ++++++++++++++
14 files changed, 399 insertions(+)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index fe2c97163c5..976b0de3c2b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet21",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "01:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "01:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "01:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 15c00df06ba..220b99bc71f 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet44",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "02:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "02:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "02:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 8a9eb90d082..29479ae41e4 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet56",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "03:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "03:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "03:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 3d8fb01e747..72ef07abb19 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet68",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "04:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "04:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "04:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index 3cd82abc1f8..b91621feae7 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet80",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "05:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "05:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "05:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 5e07873dd58..f36bd058a38 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet92",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "06:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "06:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "06:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index b9ca5c2f5df..1bf347fbbfc 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -60,6 +60,39 @@
"switch_port": "Ethernet104",
"vendor": "Intel"
},
+ {
+ "device": "eth1",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "07:01:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f0"
+ },
+ {
+ "device": "eth2",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "07:02:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enp4s0f1"
+ },
+ {
+ "device": "eth3",
+ "enabled": false,
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "07:03:00:00:00:00",
+ "management": false,
+ "mountable": false,
+ "mounted": false,
+ "name": "enx020000000002"
+ },
{
"device": "bmc",
"enabled": true,
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
index 4c8c51be1d4..76a3f10fac2 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -36,6 +36,30 @@ engelbourg-1:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 01:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 01:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 01:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
index e32b94af085..de532f9305d 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -36,6 +36,30 @@ engelbourg-2:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 02:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 02:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 02:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
index e3d8dbf6058..2deb2e7710c 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -36,6 +36,30 @@ engelbourg-3:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 03:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 03:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 03:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
index 4a608e1e676..be11407f5ad 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -36,6 +36,30 @@ engelbourg-4:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 04:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 04:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 04:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
index 7d317533214..ba535018254 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -36,6 +36,30 @@ engelbourg-5:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 05:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 05:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 05:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
index 915da906a77..fc207d6b86b 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -36,6 +36,30 @@ engelbourg-6:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 06:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 06:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 06:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
index d8d20ebc58f..215a96652cb 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -36,6 +36,30 @@ engelbourg-7:
sriov: false
sriov_totalvfs: 0
vendor: Intel
+ eth1:
+ interface: Ethernet
+ mac: 07:01:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f0
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ interface: Ethernet
+ mac: 07:02:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enp4s0f1
+ enabled: false
+ mountable: false
+ mounted: false
+ eth3:
+ interface: Ethernet
+ mac: 07:03:00:00:00:00 #FAKE VALUE
+ management: false
+ name: enx020000000002
+ enabled: false
+ mountable: false
+ mounted: false
operating_system:
cstate_driver: intel_idle
cstate_governor: menu
--
GitLab
From 5bc630a60bee706454dbd34e612e127bc917a94e Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 27 Mar 2025 09:39:43 +0100
Subject: [PATCH 12/18] [strasbourg][engelbourg]Remove BMC from engelbourg
description
---
.../clusters/engelbourg/nodes/engelbourg-1.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-2.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-3.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-4.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-5.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-6.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-7.json | 13 +------------
.../clusters/engelbourg/nodes/engelbourg-8.json | 15 ++-------------
.../clusters/engelbourg/engelbourg.yaml | 8 +-------
.../clusters/engelbourg/nodes/engelbourg-8.yaml | 2 +-
10 files changed, 11 insertions(+), 105 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 976b0de3c2b..0758f8d6cc6 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.1",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-1-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 220b99bc71f..6c0ac290347 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.2",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-2-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 29479ae41e4..623d2395260 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.3",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-3-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 72ef07abb19..8499a2cfa3b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.4",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-4-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index b91621feae7..8862e761f58 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.5",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-5-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index f36bd058a38..22c07121eaa 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.6",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-6-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 1bf347fbbfc..3557a8f32a0 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.7",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-7-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index 3da0f4933ad..1acb07ab1c6 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
@@ -24,7 +24,7 @@
"ram_size": 8589934592
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "none",
"ipmitool": {
"retries": 5
}
@@ -92,17 +92,6 @@
"mountable": false,
"mounted": false,
"name": "enx020000000002"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.161.8",
- "kavlan": false,
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "engelbourg-8-bmc.strasbourg.grid5000.fr"
}
],
"nodeset": "engelbourg",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
index fd786493f96..03f52cdfeab 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -22,12 +22,6 @@ nodes:
model: Intel(R) Pentium(R)
version: D1517
network_adapters:
- bmc:
- interface: Ethernet
- management: true
- enabled: true
- mountable: false
- mounted: false
eth0:
enabled: true
mountable: true
@@ -39,6 +33,6 @@ nodes:
software:
standard-environment: debian11-x64-std # TODO: check that architecture is OK
management_tools:
- bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ bmc_vendor_tool: "none"
nodeset: engelbourg # TODO: rename cluster
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
index 3f654ffdd06..ec22dff2220 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
@@ -11,7 +11,7 @@ engelbourg-8:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
--
GitLab
From fdfd698fbb632df9c449366aa54b02742b5c1fe5 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 15:03:15 +0100
Subject: [PATCH 13/18] [strasbourg][engelbourg] Fix gw strasbourg description
---
.../strasbourg/networks/gw-strasbourg.yaml | 60 ++++---------------
1 file changed, 12 insertions(+), 48 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 4eb4fdf1864..a01c3455f26 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -68,51 +68,15 @@ gw:
kavlan_pattern: "%PORT%"
kind: node
ports:
- 0:
- uid: port-channel1
- kind: channel
- 1:
- uid: port-channel1
- kind: channel
- 2:
- uid: pve-1
- kind: server
- 3:
- uid: pve-2
- kind: server
- 6: fleckenstein-1-eth0
- 7:
- 8: fleckenstein-1-eth2
- 9: fleckenstein-2-eth0
- 10:
- 11: fleckenstein-2-eth2
- 12: fleckenstein-3-eth0
- 13:
- 14: fleckenstein-3-eth2
- 15: fleckenstein-4-eth0
- 16:
- 17: fleckenstein-4-eth2
- 18: fleckenstein-5-eth0
- 19:
- 20: fleckenstein-5-eth2
- 21: fleckenstein-6-eth0
- 22:
- 23: fleckenstein-6-eth2
- 24: fleckenstein-7-eth0
- 25:
- 26: fleckenstein-7-eth2
- 27: fleckenstein-8-eth0
- 28:
- 29: fleckenstein-8-eth2
- 30: fleckenstein-9-eth0
- 31:
- 32: fleckenstein-9-eth2
- 33: fleckenstein-10-eth0
- 34:
- 35: fleckenstein-10-eth2
- channels:
- port-channel1:
- port: port-channel1
- uid: srv-data
- rate: 50000000000
- kind: server
+ 0: dev-strasbourg
+ 1: dev-apornet
+ 2: stonet-1
+ 3: ibat-1
+ 4: wiki-net
+ 5: strasbourg-1
+ 6: dev-www
+ 7: soknet-1
+ 19: PE-RENATER
+ 20: p4-1
+ 21: p4-1
+ 22: pfsense-icube
--
GitLab
From 00f3ca291f8b57190f51c1a5d45bc6db51adb946 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 3 Apr 2025 11:26:32 +0200
Subject: [PATCH 14/18] [strasbourg][engelbourg] Update gw description
---
input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index a01c3455f26..562efcef211 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -1,7 +1,6 @@
---
gw:
- model: wedge100bf_32x
- serial: AM26029251
+ model: Juniper EX4600-40F
ip: 172.16.175.254
ip6: 2001:660:4406:a00::ffff:ffff
kind: router
@@ -63,7 +62,7 @@ gw:
- 10.39.192.0/18
linecards:
1:
- rate: 25000000000
+ rate: 10000000000
snmp_pattern: "Ethernet%PORT%"
kavlan_pattern: "%PORT%"
kind: node
--
GitLab
From c786d2de5614006130fcee318fe5ead28174a2e5 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 3 Apr 2025 11:30:20 +0200
Subject: [PATCH 15/18] [strasbourg][engelbourg] Remove BMC version
---
.../strasbourg/clusters/engelbourg/nodes/engelbourg-1.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-2.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-3.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-4.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-5.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-6.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-7.json | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml | 2 +-
.../strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 0758f8d6cc6..c35993fce43 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 6c0ac290347..1461dab7b6c 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 623d2395260..3a62ae8fbcc 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 8499a2cfa3b..79e3b06b0a0 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index 8862e761f58..e1cfdd9a7f0 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 22c07121eaa..d9c9841d626 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 3557a8f32a0..11ad18452fe 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -11,7 +11,7 @@
"vendor": "American Megatrends Inc.",
"version": "R1.00.E4"
},
- "bmc_version": "15.00",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "1970-01-01",
"manufacturer": "Default string",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
index 76a3f10fac2..09943a6a73b 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -11,7 +11,7 @@ engelbourg-1:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
index de532f9305d..b0949304efd 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -11,7 +11,7 @@ engelbourg-2:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
index 2deb2e7710c..3b36b16abe5 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -11,7 +11,7 @@ engelbourg-3:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
index be11407f5ad..484e2fcbc30 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -11,7 +11,7 @@ engelbourg-4:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
index ba535018254..6576588dc94 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -11,7 +11,7 @@ engelbourg-5:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
index fc207d6b86b..4169975a681 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -11,7 +11,7 @@ engelbourg-6:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
index 215a96652cb..fd1dec3062f 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -11,7 +11,7 @@ engelbourg-7:
release_date: 02/08/2021
vendor: American Megatrends Inc.
version: R1.00.E4
- bmc_version: '15.00'
+ bmc_version: unknown
chassis:
manufacturer: Default string
name: Default string
--
GitLab
From 428c0c4495f4799ce86ad0be664a44a990375482 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Thu, 3 Apr 2025 14:25:22 +0200
Subject: [PATCH 16/18] [strasbourg][network] Put in comment equipements not in
the ref-repo
---
.../network_equipments/sw-core.json | 52 -------------------
.../sites/strasbourg/networks/sw-core.yaml | 26 +++++-----
2 files changed, 13 insertions(+), 65 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index f7e9479217c..35031a73ba4 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -40,16 +40,8 @@
"uid": "pve-2"
},
{
- "kind": "node",
- "port": "sw1-eth0",
- "snmp_name": "Ethernet4",
- "uid": "inetlab"
},
{
- "kind": "node",
- "port": "sw1-eth1",
- "snmp_name": "Ethernet5",
- "uid": "inetlab"
},
{
"kind": "node",
@@ -58,10 +50,6 @@
"uid": "fleckenstein-1"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet7",
- "uid": "fleckenstein-1"
},
{
"kind": "node",
@@ -76,10 +64,6 @@
"uid": "fleckenstein-2"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet10",
- "uid": "fleckenstein-2"
},
{
"kind": "node",
@@ -94,10 +78,6 @@
"uid": "fleckenstein-3"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet13",
- "uid": "fleckenstein-3"
},
{
"kind": "node",
@@ -112,10 +92,6 @@
"uid": "fleckenstein-4"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet16",
- "uid": "fleckenstein-4"
},
{
"kind": "node",
@@ -130,10 +106,6 @@
"uid": "fleckenstein-5"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet19",
- "uid": "fleckenstein-5"
},
{
"kind": "node",
@@ -148,10 +120,6 @@
"uid": "fleckenstein-6"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet22",
- "uid": "fleckenstein-6"
},
{
"kind": "node",
@@ -166,10 +134,6 @@
"uid": "fleckenstein-7"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet25",
- "uid": "fleckenstein-7"
},
{
"kind": "node",
@@ -184,10 +148,6 @@
"uid": "fleckenstein-8"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet28",
- "uid": "fleckenstein-8"
},
{
"kind": "node",
@@ -202,10 +162,6 @@
"uid": "fleckenstein-9"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet31",
- "uid": "fleckenstein-9"
},
{
"kind": "node",
@@ -220,10 +176,6 @@
"uid": "fleckenstein-10"
},
{
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet34",
- "uid": "fleckenstein-10"
},
{
"kind": "node",
@@ -243,10 +195,6 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet40",
- "uid": "ramstein-1"
},
{
},
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index 82e22b7af23..f555707c0b3 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -29,42 +29,42 @@ sw-core:
3:
uid: pve-2
kind: server
- 4: inetlab-sw1-eth0
- 5: inetlab-sw1-eth1
+# 4: inetlab-sw1-eth0
+# 5: inetlab-sw1-eth1
6: fleckenstein-1-eth0
- 7: fleckenstein-1-eth1
+# 7: fleckenstein-1-eth1
8: fleckenstein-1-eth2
9: fleckenstein-2-eth0
- 10: fleckenstein-2-eth1
+# 10: fleckenstein-2-eth1
11: fleckenstein-2-eth2
12: fleckenstein-3-eth0
- 13: fleckenstein-3-eth1
+# 13: fleckenstein-3-eth1
14: fleckenstein-3-eth2
15: fleckenstein-4-eth0
- 16: fleckenstein-4-eth1
+# 16: fleckenstein-4-eth1
17: fleckenstein-4-eth2
18: fleckenstein-5-eth0
- 19: fleckenstein-5-eth1
+# 19: fleckenstein-5-eth1
20: fleckenstein-5-eth2
21: fleckenstein-6-eth0
- 22: fleckenstein-6-eth1
+# 22: fleckenstein-6-eth1
23: fleckenstein-6-eth2
24: fleckenstein-7-eth0
- 25: fleckenstein-7-eth1
+# 25: fleckenstein-7-eth1
26: fleckenstein-7-eth2
27: fleckenstein-8-eth0
- 28: fleckenstein-8-eth1
+# 28: fleckenstein-8-eth1
29: fleckenstein-8-eth2
30: fleckenstein-9-eth0
- 31: fleckenstein-9-eth1
+# 31: fleckenstein-9-eth1
32: fleckenstein-9-eth2
33: fleckenstein-10-eth0
- 34: fleckenstein-10-eth1
+# 34: fleckenstein-10-eth1
35: fleckenstein-10-eth2
36:
uid: sw-admin
kind: switch
- 40: ramstein-1
+# 40: ramstein-1
44:
uid: engelbourg-2-eth0
rate: 1000000000
--
GitLab
From bb74f21109d2dad4cbac4d1356495eb6c2a971a8 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Thu, 3 Apr 2025 14:57:20 +0200
Subject: [PATCH 17/18] [strasbourg][network] Set type 'other' for equipments
different than nodes
---
.../engelbourg/nodes/engelbourg-1.json | 4 +-
.../strasbourg/network_equipments/gw.json | 50 +++---
.../network_equipments/sw-admin.json | 157 +++++++-----------
.../strasbourg/networks/gw-strasbourg.yaml | 48 ++++--
.../sites/strasbourg/networks/sw-admin.yaml | 12 +-
5 files changed, 126 insertions(+), 145 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index c35993fce43..f1cf8c49685 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-admin",
- "switch_port": "Ethernet21",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 10ff5e05eff..6f6b6c2a003 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -13,50 +13,42 @@
"kind": "node",
"ports": [
{
- "kind": "node",
- "port": "strasbourg",
+ "kind": "other",
"snmp_name": "Ethernet0",
- "uid": "dev"
+ "uid": "dev-strasbourg"
},
{
- "kind": "node",
- "port": "apornet",
+ "kind": "other",
"snmp_name": "Ethernet1",
- "uid": "dev"
+ "uid": "dev-apornet"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet2",
"uid": "stonet-1"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet3",
"uid": "ibat-1"
},
{
- "kind": "node",
- "port": "net",
+ "kind": "other",
"snmp_name": "Ethernet4",
- "uid": "wiki"
+ "uid": "wiki-net"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet5",
- "uid": "strasbourg-1"
+ "uid": "strasbourg"
},
{
- "kind": "node",
- "port": "www",
+ "kind": "other",
"snmp_name": "Ethernet6",
- "uid": "dev"
+ "uid": "dev-www"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet7",
"uid": "soknet-1"
},
@@ -83,28 +75,24 @@
{
},
{
- "kind": "node",
- "port": "RENATER",
+ "kind": "other",
"snmp_name": "Ethernet19",
- "uid": "PE"
+ "uid": "PE-RENATER"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet20",
"uid": "p4-1"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet21",
"uid": "p4-1"
},
{
- "kind": "node",
- "port": "icube",
+ "kind": "other",
"snmp_name": "Ethernet22",
- "uid": "pfsense"
+ "uid": "pfsense-icube"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index 2adf8ce2c04..d344a32f6e6 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -6,193 +6,162 @@
},
{
"kavlan_pattern": "%PORT%",
- "kind": "node",
+ "kind": "other",
"ports": [
{
- "kind": "node",
- "port": "data",
+ "kind": "other",
"snmp_name": "Ethernet0",
- "uid": "srv"
+ "uid": "srv-data-bmc"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet1",
- "uid": "pve-1"
+ "uid": "pve-1-bmc"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet2",
- "uid": "pve-2"
+ "uid": "pve-2-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet3",
- "uid": "fleckenstein-1"
+ "uid": "fleckenstein-1-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet4",
- "uid": "fleckenstein-2"
+ "uid": "fleckenstein-2-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet5",
- "uid": "fleckenstein-3"
+ "uid": "fleckenstein-3-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet6",
- "uid": "fleckenstein-4"
+ "uid": "fleckenstein-4-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet7",
- "uid": "fleckenstein-5"
+ "uid": "fleckenstein-5-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet8",
- "uid": "fleckenstein-6"
+ "uid": "fleckenstein-6-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet9",
- "uid": "fleckenstein-7"
+ "uid": "fleckenstein-7-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet10",
- "uid": "fleckenstein-8"
+ "uid": "fleckenstein-8-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet11",
- "uid": "fleckenstein-9"
+ "uid": "fleckenstein-9-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet12",
- "uid": "fleckenstein-10"
+ "uid": "fleckenstein-10-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet13",
- "uid": "engelbourg-2"
+ "uid": "engelbourg-2-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet14",
- "uid": "engelbourg-3"
+ "uid": "engelbourg-3-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet15",
- "uid": "engelbourg-4"
+ "uid": "engelbourg-4-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet16",
- "uid": "engelbourg-5"
+ "uid": "engelbourg-5-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet17",
- "uid": "engelbourg-6"
+ "uid": "engelbourg-6-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet18",
- "uid": "engelbourg-7"
+ "uid": "engelbourg-7-bmc"
},
{
- "kind": "node",
- "port": "bmc",
+ "kind": "other",
"snmp_name": "Ethernet19",
- "uid": "engelbourg-8"
+ "uid": "engelbourg-8-bmc"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet20",
- "uid": "ramstein-1"
+ "uid": "ramstein-1-bmc"
},
{
- "kind": "node",
- "port": "eth0",
+ "kind": "other",
"snmp_name": "Ethernet21",
- "uid": "engelbourg-1"
+ "uid": "sw-core-mgmt"
},
{
- "kind": "node",
- "port": "devstrasbourg-bmc",
+ "kind": "other",
"snmp_name": "Ethernet22",
- "uid": "iotlab"
+ "uid": "iotlab-devstrasbourg-bmc"
},
{
- "kind": "node",
- "port": "devaportnet-bmc",
+ "kind": "other",
"snmp_name": "Ethernet23",
- "uid": "inetlab"
+ "uid": "inetlab-devaportnet-bmc"
},
{
- "kind": "node",
- "port": "stonet-bmc",
+ "kind": "other",
"snmp_name": "Ethernet24",
- "uid": "inetlab"
+ "uid": "inetlab-stonet-bmc"
},
{
- "kind": "node",
- "port": "ibat-bmc",
+ "kind": "other",
"snmp_name": "Ethernet25",
- "uid": "inetlab"
+ "uid": "inetlab-ibat-bmc"
},
{
- "kind": "node",
- "port": "wikinet-bmc",
+ "kind": "other",
"snmp_name": "Ethernet26",
- "uid": "inetlab"
+ "uid": "inetlab-wikinet-bmc"
},
{
- "kind": "node",
- "port": "soknet-bmc",
+ "kind": "other",
"snmp_name": "Ethernet27",
- "uid": "inetlab"
+ "uid": "inetlab-soknet-bmc"
},
{
- "kind": "node",
- "port": "strasbourg-bmc",
+ "kind": "other",
"snmp_name": "Ethernet28",
- "uid": "iotlab"
+ "uid": "iotlab-strasbourg-bmc"
},
{
- "kind": "node",
- "port": "devwww-bmc",
+ "kind": "other",
"snmp_name": "Ethernet29",
- "uid": "iotlab"
+ "uid": "iotlab-devwww-bmc"
},
{
- "kind": "node",
- "port": "www-bmc",
+ "kind": "other",
"snmp_name": "Ethernet30",
- "uid": "iotlab"
+ "uid": "iotlab-www-bmc"
},
{
},
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 562efcef211..23a4142321a 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -67,15 +67,39 @@ gw:
kavlan_pattern: "%PORT%"
kind: node
ports:
- 0: dev-strasbourg
- 1: dev-apornet
- 2: stonet-1
- 3: ibat-1
- 4: wiki-net
- 5: strasbourg-1
- 6: dev-www
- 7: soknet-1
- 19: PE-RENATER
- 20: p4-1
- 21: p4-1
- 22: pfsense-icube
+ 0:
+ uid: dev-strasbourg
+ kind: other
+ 1:
+ uid: dev-apornet
+ kind: other
+ 2:
+ uid: stonet-1
+ kind: other
+ 3:
+ uid: ibat-1
+ kind: other
+ 4:
+ uid: wiki-net
+ kind: other
+ 5:
+ uid: strasbourg
+ kind: other
+ 6:
+ uid: dev-www
+ kind: other
+ 7:
+ uid: soknet-1
+ kind: other
+ 19:
+ uid: PE-RENATER
+ kind: other
+ 20:
+ uid: p4-1
+ kind: other
+ 21:
+ uid: p4-1
+ kind: other
+ 22:
+ uid: pfsense-icube
+ kind: other
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index 7164b511f91..bbf4a909b92 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -11,11 +11,11 @@ sw-admin:
rate: 1000000000
snmp_pattern: "Ethernet%PORT%"
kavlan_pattern: "%PORT%"
- kind: node
+ kind: other
ports:
- 0: srv-data
- 1: pve-1
- 2: pve-2
+ 0: srv-data-bmc
+ 1: pve-1-bmc
+ 2: pve-2-bmc
3: fleckenstein-1-bmc
4: fleckenstein-2-bmc
5: fleckenstein-3-bmc
@@ -33,8 +33,8 @@ sw-admin:
17: engelbourg-6-bmc
18: engelbourg-7-bmc
19: engelbourg-8-bmc
- 20: ramstein-1
- 21: engelbourg-1
+ 20: ramstein-1-bmc
+ 21: sw-core-mgmt
22: iotlab-devstrasbourg-bmc
23: inetlab-devaportnet-bmc
24: inetlab-stonet-bmc
--
GitLab
From 6698cc9c528430fe85986b34d08c6b5db3a77dc8 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Thu, 3 Apr 2025 15:02:23 +0200
Subject: [PATCH 18/18] [strasbourg][network] Rename p4 into sw-core
---
data/grid5000/sites/strasbourg/network_equipments/gw.json | 6 +++---
input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 6f6b6c2a003..054872116d9 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -82,12 +82,12 @@
{
"kind": "other",
"snmp_name": "Ethernet20",
- "uid": "p4-1"
+ "uid": "sw-core-oob"
},
{
- "kind": "other",
+ "kind": "switch",
"snmp_name": "Ethernet21",
- "uid": "p4-1"
+ "uid": "sw-core"
},
{
"kind": "other",
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 23a4142321a..0f5da55c9aa 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -95,11 +95,11 @@ gw:
uid: PE-RENATER
kind: other
20:
- uid: p4-1
+ uid: sw-core-oob
kind: other
21:
- uid: p4-1
- kind: other
+ uid: sw-core
+ kind: switch
22:
uid: pfsense-icube
kind: other
--
GitLab