From 4e3f4c3206fc852c6467649a033dc90f163c6813 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/47] [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 d61dbdd5f2d..b7c367fa29f 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -213,6 +213,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 1665d281a3a2cd39c7cd8aff278279bbfbb7b89d Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 17 Mar 2025 17:28:03 +0100
Subject: [PATCH 02/47] Add DNS configuration of sw-core and sw-admin
---
.../network_equipments/sw-admin-adm.json | 248 +++++++++
.../network_equipments/sw-admin.json | 248 +++++++++
.../network_equipments/sw-core-adm.json | 512 ++++++++++++++++++
.../network_equipments/sw-core.json | 512 ++++++++++++++++++
.../strasbourg/networks/sw-admin-adm.yaml | 47 ++
.../sites/strasbourg/networks/sw-admin.yaml | 47 ++
.../strasbourg/networks/sw-core-adm.yaml | 90 +++
.../sites/strasbourg/networks/sw-core.yaml | 91 ++++
8 files changed, 1795 insertions(+)
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
create mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-core.json
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-admin.yaml
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
create mode 100644 input/grid5000/sites/strasbourg/networks/sw-core.yaml
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
new file mode 100644
index 00000000000..e6bd996f8c0
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
@@ -0,0 +1,248 @@
+{
+ "ip": "172.17.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": "eth0",
+ "snmp_name": "Ethernet3",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet4",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet5",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet6",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet8",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet9",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet10",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet11",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet12",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet13",
+ "uid": "engelbourg-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet14",
+ "uid": "engelbourg-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet15",
+ "uid": "engelbourg-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet16",
+ "uid": "engelbourg-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet17",
+ "uid": "engelbourg-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet18",
+ "uid": "engelbourg-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet19",
+ "uid": "engelbourg-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet20",
+ "uid": "ramstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "core mgmt",
+ "snmp_name": "Ethernet21",
+ "uid": "sw"
+ },
+ {
+ "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": "node",
+ "port": "core",
+ "snmp_name": "Ethernet48",
+ "uid": "sw"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "Ethernet%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "unknown",
+ "site": "strasbourg",
+ "snmp_community": "Unknown",
+ "type": "network_equipment",
+ "uid": "sw-admin-adm"
+}
\ No newline at end of file
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..314e3c1c668
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,248 @@
+{
+ "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": "eth0",
+ "snmp_name": "Ethernet3",
+ "uid": "fleckenstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet4",
+ "uid": "fleckenstein-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet5",
+ "uid": "fleckenstein-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet6",
+ "uid": "fleckenstein-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7",
+ "uid": "fleckenstein-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet8",
+ "uid": "fleckenstein-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet9",
+ "uid": "fleckenstein-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet10",
+ "uid": "fleckenstein-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet11",
+ "uid": "fleckenstein-9"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet12",
+ "uid": "fleckenstein-10"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet13",
+ "uid": "engelbourg-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet14",
+ "uid": "engelbourg-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet15",
+ "uid": "engelbourg-4"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet16",
+ "uid": "engelbourg-5"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet17",
+ "uid": "engelbourg-6"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet18",
+ "uid": "engelbourg-7"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet19",
+ "uid": "engelbourg-8"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet20",
+ "uid": "ramstein-1"
+ },
+ {
+ "kind": "node",
+ "port": "core mgmt",
+ "snmp_name": "Ethernet21",
+ "uid": "sw"
+ },
+ {
+ "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": "node",
+ "port": "core",
+ "snmp_name": "Ethernet48",
+ "uid": "sw"
+ }
+ ],
+ "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-adm.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
new file mode 100644
index 00000000000..822f2eb4776
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
@@ -0,0 +1,512 @@
+{
+ "channels": {
+ "port-channel1": {
+ "kind": "server",
+ "port": "port-channel1",
+ "rate": 50000000000,
+ "uid": "srv-data"
+ }
+ },
+ "ip": "172.17.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": "node",
+ "port": "admin",
+ "snmp_name": "Ethernet36",
+ "uid": "sw"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet40",
+ "uid": "ramstein-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet44",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet48",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet52",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet56",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet60",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet64",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet68",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet72",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet76",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet80",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet84",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet88",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet92",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet96",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet100",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet104",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet108",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet112",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet116",
+ "uid": "engelbourg-8"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet120",
+ "uid": "engelbourg-8"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet124",
+ "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-adm"
+}
\ 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..15f39ca3920
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,512 @@
+{
+ "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": "node",
+ "port": "admin",
+ "snmp_name": "Ethernet36",
+ "uid": "sw"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet40",
+ "uid": "ramstein-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet44",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet48",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet52",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet56",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet60",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet64",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet68",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet72",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet76",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet80",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet84",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet88",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet92",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet96",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet100",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet104",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet108",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet112",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet116",
+ "uid": "engelbourg-8"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "Ethernet120",
+ "uid": "engelbourg-8"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth2",
+ "snmp_name": "Ethernet124",
+ "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-adm.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
new file mode 100644
index 00000000000..dc63b76df6f
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
@@ -0,0 +1,47 @@
+---
+sw-admin-adm:
+ model: unknown
+ ip: 172.17.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
+ 4: fleckenstein-2
+ 5: fleckenstein-3
+ 6: fleckenstein-4
+ 7: fleckenstein-5
+ 8: fleckenstein-6
+ 9: fleckenstein-7
+ 10: fleckenstein-8
+ 11: fleckenstein-9
+ 12: fleckenstein-10
+ 13: engelbourg-2
+ 14: engelbourg-3
+ 15: engelbourg-4
+ 16: engelbourg-5
+ 17: engelbourg-6
+ 18: engelbourg-7
+ 19: engelbourg-8
+ 20: ramstein-1
+ 21: sw-core mgmt
+ 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: sw-core
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..3d2d7fd3573
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,47 @@
+---
+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
+ 4: fleckenstein-2
+ 5: fleckenstein-3
+ 6: fleckenstein-4
+ 7: fleckenstein-5
+ 8: fleckenstein-6
+ 9: fleckenstein-7
+ 10: fleckenstein-8
+ 11: fleckenstein-9
+ 12: fleckenstein-10
+ 13: engelbourg-2
+ 14: engelbourg-3
+ 15: engelbourg-4
+ 16: engelbourg-5
+ 17: engelbourg-6
+ 18: engelbourg-7
+ 19: engelbourg-8
+ 20: ramstein-1
+ 21: sw-core mgmt
+ 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: sw-core
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml b/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
new file mode 100644
index 00000000000..d24c79cbf80
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
@@ -0,0 +1,90 @@
+---
+sw-core-adm:
+ model: wedge100bf_32x
+ ip: 172.17.175.252
+ #TODO
+ #ip6: 2001:660:4406:a00::ffff:ffff
+ kind: switch
+ managed_by_us: true
+ snmp_community: Unknown
+ 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: sw-admin
+ 40: ramstein-1
+ 44: engelbourg-2-eth0
+ 48: engelbourg-2-eth1
+ 52: engelbourg-2-eth2
+ 56: engelbourg-3-eth0
+ 60: engelbourg-3-eth1
+ 64: engelbourg-3-eth2
+ 68: engelbourg-4-eth0
+ 72: engelbourg-4-eth1
+ 76: engelbourg-4-eth2
+ 80: engelbourg-5-eth0
+ 84: engelbourg-5-eth1
+ 88: engelbourg-5-eth2
+ 92: engelbourg-6-eth0
+ 96: engelbourg-6-eth1
+ 100: engelbourg-6-eth2
+ 104: engelbourg-7-eth0
+ 108: engelbourg-7-eth1
+ 112: engelbourg-7-eth2
+ 116: engelbourg-8-eth0
+ 120: engelbourg-8-eth1
+ 124: engelbourg-8-eth2
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: srv-data
+ rate: 50000000000
+ kind: server
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..eea6f1738e3
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,91 @@
+---
+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
+ 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: sw-admin
+ 40: ramstein-1
+ 44: engelbourg-2-eth0
+ 48: engelbourg-2-eth1
+ 52: engelbourg-2-eth2
+ 56: engelbourg-3-eth0
+ 60: engelbourg-3-eth1
+ 64: engelbourg-3-eth2
+ 68: engelbourg-4-eth0
+ 72: engelbourg-4-eth1
+ 76: engelbourg-4-eth2
+ 80: engelbourg-5-eth0
+ 84: engelbourg-5-eth1
+ 88: engelbourg-5-eth2
+ 92: engelbourg-6-eth0
+ 96: engelbourg-6-eth1
+ 100: engelbourg-6-eth2
+ 104: engelbourg-7-eth0
+ 108: engelbourg-7-eth1
+ 112: engelbourg-7-eth2
+ 116: engelbourg-8-eth0
+ 120: engelbourg-8-eth1
+ 124: engelbourg-8-eth2
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: srv-data
+ rate: 50000000000
+ kind: server
+
--
GitLab
From a9e625c6eda5de3c36203ef13e002269bc1d0659 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 03/47] 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 075386d1fd69b4d66339d5c48ca74d12ba62ed9f 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 04/47] [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 80e54cee6bdfe4edb9e1ceb2d6f1741018ff4521 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 18 Mar 2025 15:07:57 +0100
Subject: [PATCH 05/47] [strasbourg][network] New description for gw-strasbourg
---
.../strasbourg/networks/gw-strasbourg.yaml | 66 +++++--------------
1 file changed, 15 insertions(+), 51 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 4eb4fdf1864..39c0cf85101 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,56 +62,21 @@ gw:
- 10.39.192.0/18
linecards:
1:
- rate: 25000000000
+ rate: 10000000000
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
- 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: devstrasbourg
+ 1: devapornet
+ 2: stonet
+ 3: ibat
+ 4: wikinet
+ 5: strasbourg
+ 6: devwww
+ 7: soknet
+ 19: PE RENATER
+ 20: p4-1
+ 21: p4-1
+ 22: pfsense icube
+
--
GitLab
From 97cd2684dcaad80c44a1c36578c8546a464fa627 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 06/47] [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 130141926d5..43fe1ab0cfc 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -130,6 +130,10 @@ ecotype:
eno2: eth1
eno3: eth2
eno4: eth3
+engelbourg:
+ enp2s0: eth0
+ enp4s0f0: eth1
+ enp4s0f1: eth2
fleckenstein:
ens10f0: eth0
ens10f1: eth1
--
GitLab
From 968854d45495ec7289ab9f5343f2e55343bebe83 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 07/47] [strasbourg][engelbourg] Fix gw strasbourg description
---
.../strasbourg/networks/gw-strasbourg.yaml | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
index 39c0cf85101..562efcef211 100644
--- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
+++ b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yaml
@@ -67,16 +67,15 @@ gw:
kavlan_pattern: "%PORT%"
kind: node
ports:
- 0: devstrasbourg
- 1: devapornet
- 2: stonet
- 3: ibat
- 4: wikinet
- 5: strasbourg
- 6: devwww
- 7: soknet
- 19: PE RENATER
+ 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
-
+ 22: pfsense-icube
--
GitLab
From 8114bb1c8955feb5956956608a91578fc1b38866 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 08/47] [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 d05f28eefe902d66354ee15cfbb6913464e80f53 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 17:07:38 +0100
Subject: [PATCH 09/47] Remove sw-admin-adm and sw-core-adm file description to
fix pipeline
---
.../strasbourg/networks/sw-admin-adm.yaml | 47 ----------
.../strasbourg/networks/sw-core-adm.yaml | 90 -------------------
2 files changed, 137 deletions(-)
delete mode 100644 input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
delete mode 100644 input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
deleted file mode 100644
index dc63b76df6f..00000000000
--- a/input/grid5000/sites/strasbourg/networks/sw-admin-adm.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-sw-admin-adm:
- model: unknown
- ip: 172.17.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
- 4: fleckenstein-2
- 5: fleckenstein-3
- 6: fleckenstein-4
- 7: fleckenstein-5
- 8: fleckenstein-6
- 9: fleckenstein-7
- 10: fleckenstein-8
- 11: fleckenstein-9
- 12: fleckenstein-10
- 13: engelbourg-2
- 14: engelbourg-3
- 15: engelbourg-4
- 16: engelbourg-5
- 17: engelbourg-6
- 18: engelbourg-7
- 19: engelbourg-8
- 20: ramstein-1
- 21: sw-core mgmt
- 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: sw-core
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml b/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
deleted file mode 100644
index d24c79cbf80..00000000000
--- a/input/grid5000/sites/strasbourg/networks/sw-core-adm.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-sw-core-adm:
- model: wedge100bf_32x
- ip: 172.17.175.252
- #TODO
- #ip6: 2001:660:4406:a00::ffff:ffff
- kind: switch
- managed_by_us: true
- snmp_community: Unknown
- 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: sw-admin
- 40: ramstein-1
- 44: engelbourg-2-eth0
- 48: engelbourg-2-eth1
- 52: engelbourg-2-eth2
- 56: engelbourg-3-eth0
- 60: engelbourg-3-eth1
- 64: engelbourg-3-eth2
- 68: engelbourg-4-eth0
- 72: engelbourg-4-eth1
- 76: engelbourg-4-eth2
- 80: engelbourg-5-eth0
- 84: engelbourg-5-eth1
- 88: engelbourg-5-eth2
- 92: engelbourg-6-eth0
- 96: engelbourg-6-eth1
- 100: engelbourg-6-eth2
- 104: engelbourg-7-eth0
- 108: engelbourg-7-eth1
- 112: engelbourg-7-eth2
- 116: engelbourg-8-eth0
- 120: engelbourg-8-eth1
- 124: engelbourg-8-eth2
- channels:
- port-channel1:
- port: port-channel1
- uid: srv-data
- rate: 50000000000
- kind: server
--
GitLab
From 5b3870b6337e87e5a4afe5760a8851d444e269b0 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 17:16:02 +0100
Subject: [PATCH 10/47] [strasbourg] Add data changes due to deleting
sw-admin-adm and sw-core-adm files
---
.../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 +-
.../network_equipments/sw-admin-adm.json | 248 ---------
.../network_equipments/sw-core-adm.json | 512 ------------------
19 files changed, 27 insertions(+), 787 deletions(-)
delete mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
delete mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
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..34025502a2b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-2.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet44"
},
{
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..a01a92ff586 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-3.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet56"
},
{
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..5b786311420 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-4.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet68"
},
{
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..89178620993 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-5.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet80"
},
{
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..7a0dc142e76 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-6.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet92"
},
{
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..67916f53e97 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-7.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet104"
},
{
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..46513045b7f 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -51,7 +51,7 @@
"name": "enp2s0",
"network_address": "engelbourg-8.strasbourg.grid5000.fr",
"rate": 10000000000,
- "switch": "sw-core-adm",
+ "switch": "sw-core",
"switch_port": "Ethernet116"
},
{
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-adm.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
deleted file mode 100644
index e6bd996f8c0..00000000000
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin-adm.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
- "ip": "172.17.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": "eth0",
- "snmp_name": "Ethernet3",
- "uid": "fleckenstein-1"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet4",
- "uid": "fleckenstein-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet5",
- "uid": "fleckenstein-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet6",
- "uid": "fleckenstein-4"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet7",
- "uid": "fleckenstein-5"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet8",
- "uid": "fleckenstein-6"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet9",
- "uid": "fleckenstein-7"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet10",
- "uid": "fleckenstein-8"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet11",
- "uid": "fleckenstein-9"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet12",
- "uid": "fleckenstein-10"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet13",
- "uid": "engelbourg-2"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet14",
- "uid": "engelbourg-3"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet15",
- "uid": "engelbourg-4"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet16",
- "uid": "engelbourg-5"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet17",
- "uid": "engelbourg-6"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet18",
- "uid": "engelbourg-7"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet19",
- "uid": "engelbourg-8"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet20",
- "uid": "ramstein-1"
- },
- {
- "kind": "node",
- "port": "core mgmt",
- "snmp_name": "Ethernet21",
- "uid": "sw"
- },
- {
- "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": "node",
- "port": "core",
- "snmp_name": "Ethernet48",
- "uid": "sw"
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "Ethernet%PORT%"
- }
- ],
- "managed_by_us": true,
- "model": "unknown",
- "site": "strasbourg",
- "snmp_community": "Unknown",
- "type": "network_equipment",
- "uid": "sw-admin-adm"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
deleted file mode 100644
index 822f2eb4776..00000000000
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core-adm.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
- "channels": {
- "port-channel1": {
- "kind": "server",
- "port": "port-channel1",
- "rate": 50000000000,
- "uid": "srv-data"
- }
- },
- "ip": "172.17.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": "node",
- "port": "admin",
- "snmp_name": "Ethernet36",
- "uid": "sw"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet40",
- "uid": "ramstein-1"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet44",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet48",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet52",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet56",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet60",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet64",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet68",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet72",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet76",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet80",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet84",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet88",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet92",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet96",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet100",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet104",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet108",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet112",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet116",
- "uid": "engelbourg-8"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet120",
- "uid": "engelbourg-8"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet124",
- "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-adm"
-}
\ No newline at end of file
--
GitLab
From 5fd88e6acf080420dede7e34b034f92dd764ef8c Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Fri, 21 Mar 2025 09:07:52 +0100
Subject: [PATCH 11/47] Modification to fix pipeline
---
.../sites/strasbourg/networks/sw-admin.yaml | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index 3d2d7fd3573..9f94950b813 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -16,23 +16,23 @@ sw-admin:
0: srv-data
1: pve-1
2: pve-2
- 3: fleckenstein-1
- 4: fleckenstein-2
- 5: fleckenstein-3
- 6: fleckenstein-4
- 7: fleckenstein-5
- 8: fleckenstein-6
- 9: fleckenstein-7
- 10: fleckenstein-8
- 11: fleckenstein-9
- 12: fleckenstein-10
- 13: engelbourg-2
- 14: engelbourg-3
- 15: engelbourg-4
- 16: engelbourg-5
- 17: engelbourg-6
- 18: engelbourg-7
- 19: engelbourg-8
+ 3: fleckenstein-1 adm
+ 4: fleckenstein-2 adm
+ 5: fleckenstein-3 adm
+ 6: fleckenstein-4 adm
+ 7: fleckenstein-5 adm
+ 8: fleckenstein-6 adm
+ 9: fleckenstein-7 adm
+ 10: fleckenstein-8 adm
+ 11: fleckenstein-9 adm
+ 12: fleckenstein-10 adm
+ 13: engelbourg-2 adm
+ 14: engelbourg-3 adm
+ 15: engelbourg-4 adm
+ 16: engelbourg-5 adm
+ 17: engelbourg-6 adm
+ 18: engelbourg-7 adm
+ 19: engelbourg-8 adm
20: ramstein-1
21: sw-core mgmt
22: iotlab-devstrasbourg-bmc
--
GitLab
From 60594380c894c1c6ea288481ca09e3ff548f6ae9 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Fri, 21 Mar 2025 09:15:42 +0100
Subject: [PATCH 12/47] New fix to pass pipeline
---
.../sites/strasbourg/networks/sw-admin.yaml | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index 9f94950b813..dc6590c62fa 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -16,23 +16,23 @@ sw-admin:
0: srv-data
1: pve-1
2: pve-2
- 3: fleckenstein-1 adm
- 4: fleckenstein-2 adm
- 5: fleckenstein-3 adm
- 6: fleckenstein-4 adm
- 7: fleckenstein-5 adm
- 8: fleckenstein-6 adm
- 9: fleckenstein-7 adm
- 10: fleckenstein-8 adm
- 11: fleckenstein-9 adm
- 12: fleckenstein-10 adm
- 13: engelbourg-2 adm
- 14: engelbourg-3 adm
- 15: engelbourg-4 adm
- 16: engelbourg-5 adm
- 17: engelbourg-6 adm
- 18: engelbourg-7 adm
- 19: engelbourg-8 adm
+ 3: fleckenstein-1-adm
+ 4: fleckenstein-2-adm
+ 5: fleckenstein-3-adm
+ 6: fleckenstein-4-adm
+ 7: fleckenstein-5-adm
+ 8: fleckenstein-6-adm
+ 9: fleckenstein-7-adm
+ 10: fleckenstein-8-adm
+ 11: fleckenstein-9-adm
+ 12: fleckenstein-10-adm
+ 13: engelbourg-2-adm
+ 14: engelbourg-3-adm
+ 15: engelbourg-4-adm
+ 16: engelbourg-5-adm
+ 17: engelbourg-6-adm
+ 18: engelbourg-7-adm
+ 19: engelbourg-8-adm
20: ramstein-1
21: sw-core mgmt
22: iotlab-devstrasbourg-bmc
--
GitLab
From 74598771aa3202095d0f78108b234b8a74c1b05d Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Fri, 21 Mar 2025 09:18:20 +0100
Subject: [PATCH 13/47] New fix to pass pipeline
---
.../network_equipments/sw-admin.json | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index 314e3c1c668..cf1c909acb9 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -28,103 +28,103 @@
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet3",
"uid": "fleckenstein-1"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet4",
"uid": "fleckenstein-2"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet5",
"uid": "fleckenstein-3"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet6",
"uid": "fleckenstein-4"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet7",
"uid": "fleckenstein-5"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet8",
"uid": "fleckenstein-6"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet9",
"uid": "fleckenstein-7"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet10",
"uid": "fleckenstein-8"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet11",
"uid": "fleckenstein-9"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet12",
"uid": "fleckenstein-10"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet13",
"uid": "engelbourg-2"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet14",
"uid": "engelbourg-3"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet15",
"uid": "engelbourg-4"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet16",
"uid": "engelbourg-5"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet17",
"uid": "engelbourg-6"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet18",
"uid": "engelbourg-7"
},
{
"kind": "node",
- "port": "eth0",
+ "port": "adm",
"snmp_name": "Ethernet19",
"uid": "engelbourg-8"
},
--
GitLab
From 804b70dbd0b55f326bfa344c6f7a432c54fe06b9 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Fri, 21 Mar 2025 09:23:55 +0100
Subject: [PATCH 14/47] Fix to pass pipeline
---
.../sites/strasbourg/networks/sw-admin.yaml | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index dc6590c62fa..34665b1b1b9 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -16,23 +16,23 @@ sw-admin:
0: srv-data
1: pve-1
2: pve-2
- 3: fleckenstein-1-adm
- 4: fleckenstein-2-adm
- 5: fleckenstein-3-adm
- 6: fleckenstein-4-adm
- 7: fleckenstein-5-adm
- 8: fleckenstein-6-adm
- 9: fleckenstein-7-adm
- 10: fleckenstein-8-adm
- 11: fleckenstein-9-adm
- 12: fleckenstein-10-adm
- 13: engelbourg-2-adm
- 14: engelbourg-3-adm
- 15: engelbourg-4-adm
- 16: engelbourg-5-adm
- 17: engelbourg-6-adm
- 18: engelbourg-7-adm
- 19: engelbourg-8-adm
+ 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: sw-core mgmt
22: iotlab-devstrasbourg-bmc
--
GitLab
From 9e85c91eaf0d0d345b89e1bd798de6a8734a1057 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Fri, 21 Mar 2025 09:26:40 +0100
Subject: [PATCH 15/47] Fix to pass pipeline
---
.../network_equipments/sw-admin.json | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index cf1c909acb9..19ce0811c3b 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -28,103 +28,103 @@
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet3",
"uid": "fleckenstein-1"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet4",
"uid": "fleckenstein-2"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet5",
"uid": "fleckenstein-3"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet6",
"uid": "fleckenstein-4"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet7",
"uid": "fleckenstein-5"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet8",
"uid": "fleckenstein-6"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet9",
"uid": "fleckenstein-7"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet10",
"uid": "fleckenstein-8"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet11",
"uid": "fleckenstein-9"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet12",
"uid": "fleckenstein-10"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet13",
"uid": "engelbourg-2"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet14",
"uid": "engelbourg-3"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet15",
"uid": "engelbourg-4"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet16",
"uid": "engelbourg-5"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet17",
"uid": "engelbourg-6"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet18",
"uid": "engelbourg-7"
},
{
"kind": "node",
- "port": "adm",
+ "port": "bmc",
"snmp_name": "Ethernet19",
"uid": "engelbourg-8"
},
--
GitLab
From ad65eb0917fbdf1e300bf6d15a131c2fc95848aa 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 16/47] [strasbourg][engelbourg] Node yaml file generated for
engelbourg cluster
---
.../engelbourg/nodes/engelbourg-1.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-2.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-3.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-4.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-5.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-6.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-7.json | 81 +++++++------
.../engelbourg/nodes/engelbourg-8.json | 114 ++++++++++++------
.../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, 929 insertions(+), 296 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 34025502a2b..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet44"
+ "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 a01a92ff586..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet56"
+ "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 5b786311420..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet68"
+ "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 89178620993..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet80"
+ "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 7a0dc142e76..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet92"
+ "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 67916f53e97..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet104"
+ "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 46513045b7f..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,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": "sw-core",
- "switch_port": "Ethernet116"
+ "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 0d779c57ed7a666ef1d5619e37969e06ea2a3baf 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 17/47] [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 79eca3d3a73..83d9bb837fe 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -147,6 +147,8 @@ disk_vendor_model_mapping:
Lenovo:
- SSDSC2KG480GZL
- ST4000NM000A
+ Innodisk:
+ - M.2 (S80) 3ME4
Unknown:
- unknown
--
GitLab
From 194599f03cb72321ffea3f8f124329773cdf1758 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 18/47] [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 e2bcf0e03ffd077711508f3cc694d83da03d639e 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 19/47] [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 43fe1ab0cfc..6fa97749576 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -134,6 +134,7 @@ engelbourg:
enp2s0: eth0
enp4s0f0: eth1
enp4s0f1: eth2
+ enx020000000002: eth3
fleckenstein:
ens10f0: eth0
ens10f1: eth1
--
GitLab
From 598b844493e6c2f70ca7c802ac8c9ef5f3c99da6 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:49:10 +0100
Subject: [PATCH 20/47] Add correct rate for engelbourg port on sw-core
---
.../sites/strasbourg/networks/sw-core.yaml | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index eea6f1738e3..05c7bcb8267 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -62,26 +62,47 @@ sw-core:
36: sw-admin
40: ramstein-1
44: engelbourg-2-eth0
+ rate: 1000000000
48: engelbourg-2-eth1
+ rate: 1000000000
52: engelbourg-2-eth2
+ rate: 1000000000
56: engelbourg-3-eth0
+ rate: 1000000000
60: engelbourg-3-eth1
+ rate: 1000000000
64: engelbourg-3-eth2
+ rate: 1000000000
68: engelbourg-4-eth0
+ rate: 1000000000
72: engelbourg-4-eth1
+ rate: 1000000000
76: engelbourg-4-eth2
+ rate: 1000000000
80: engelbourg-5-eth0
+ rate: 1000000000
84: engelbourg-5-eth1
+ rate: 1000000000
88: engelbourg-5-eth2
+ rate: 1000000000
92: engelbourg-6-eth0
+ rate: 1000000000
96: engelbourg-6-eth1
+ rate: 1000000000
100: engelbourg-6-eth2
+ rate: 1000000000
104: engelbourg-7-eth0
+ rate: 1000000000
108: engelbourg-7-eth1
+ rate: 1000000000
112: engelbourg-7-eth2
+ rate: 1000000000
116: engelbourg-8-eth0
+ rate: 1000000000
120: engelbourg-8-eth1
+ rate: 1000000000
124: engelbourg-8-eth2
+ rate: 1000000000
channels:
port-channel1:
port: port-channel1
--
GitLab
From 02ddab8d011abf28393be7c63ed21fb019f58492 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:55:58 +0100
Subject: [PATCH 21/47] [strasbourg] Remove sw-admin and sw-core yaml file
---
.../sites/strasbourg/networks/sw-admin.yaml | 47 --------
.../sites/strasbourg/networks/sw-core.yaml | 112 ------------------
2 files changed, 159 deletions(-)
delete mode 100644 input/grid5000/sites/strasbourg/networks/sw-admin.yaml
delete mode 100644 input/grid5000/sites/strasbourg/networks/sw-core.yaml
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
deleted file mode 100644
index 34665b1b1b9..00000000000
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-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: sw-core mgmt
- 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: sw-core
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
deleted file mode 100644
index 05c7bcb8267..00000000000
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-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
- 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: sw-admin
- 40: ramstein-1
- 44: engelbourg-2-eth0
- rate: 1000000000
- 48: engelbourg-2-eth1
- rate: 1000000000
- 52: engelbourg-2-eth2
- rate: 1000000000
- 56: engelbourg-3-eth0
- rate: 1000000000
- 60: engelbourg-3-eth1
- rate: 1000000000
- 64: engelbourg-3-eth2
- rate: 1000000000
- 68: engelbourg-4-eth0
- rate: 1000000000
- 72: engelbourg-4-eth1
- rate: 1000000000
- 76: engelbourg-4-eth2
- rate: 1000000000
- 80: engelbourg-5-eth0
- rate: 1000000000
- 84: engelbourg-5-eth1
- rate: 1000000000
- 88: engelbourg-5-eth2
- rate: 1000000000
- 92: engelbourg-6-eth0
- rate: 1000000000
- 96: engelbourg-6-eth1
- rate: 1000000000
- 100: engelbourg-6-eth2
- rate: 1000000000
- 104: engelbourg-7-eth0
- rate: 1000000000
- 108: engelbourg-7-eth1
- rate: 1000000000
- 112: engelbourg-7-eth2
- rate: 1000000000
- 116: engelbourg-8-eth0
- rate: 1000000000
- 120: engelbourg-8-eth1
- rate: 1000000000
- 124: engelbourg-8-eth2
- rate: 1000000000
- channels:
- port-channel1:
- port: port-channel1
- uid: srv-data
- rate: 50000000000
- kind: server
-
--
GitLab
From 2e7706748dd1b6841bb62e81290b16e0c29617ad Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 24 Mar 2025 16:59:08 +0100
Subject: [PATCH 22/47] [strasbourg][engelbourg] Add file generated by rake
reference-api
---
.../engelbourg/nodes/engelbourg-2.json | 4 +-
.../engelbourg/nodes/engelbourg-3.json | 4 +-
.../engelbourg/nodes/engelbourg-4.json | 4 +-
.../engelbourg/nodes/engelbourg-5.json | 4 +-
.../engelbourg/nodes/engelbourg-6.json | 4 +-
.../engelbourg/nodes/engelbourg-7.json | 4 +-
.../engelbourg/nodes/engelbourg-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-1.json | 8 +-
.../fleckenstein/nodes/fleckenstein-10.json | 8 +-
.../fleckenstein/nodes/fleckenstein-2.json | 8 +-
.../fleckenstein/nodes/fleckenstein-3.json | 8 +-
.../fleckenstein/nodes/fleckenstein-4.json | 8 +-
.../fleckenstein/nodes/fleckenstein-5.json | 8 +-
.../fleckenstein/nodes/fleckenstein-6.json | 8 +-
.../fleckenstein/nodes/fleckenstein-7.json | 8 +-
.../fleckenstein/nodes/fleckenstein-8.json | 8 +-
.../fleckenstein/nodes/fleckenstein-9.json | 8 +-
.../network_equipments/sw-admin.json | 248 ---------
.../network_equipments/sw-core.json | 512 ------------------
19 files changed, 54 insertions(+), 814 deletions(-)
delete mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
delete mode 100644 data/grid5000/sites/strasbourg/network_equipments/sw-core.json
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..c00f88ead52 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet44",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..7b93b299a72 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet56",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..f4b694a0637 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet68",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..0757c7f9ad0 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet80",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..7597028d121 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet92",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..7b58f37cf4a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet104",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
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..eb95256ace2 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": "sw-core",
- "switch_port": "Ethernet116",
+ "switch": null,
+ "switch_port": null,
"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 ea9457f128e..e257b684fe3 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet6",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet8",
+ "switch": null,
+ "switch_port": null,
"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 03ff387febd..556fb93eb5c 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet33",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet35",
+ "switch": null,
+ "switch_port": null,
"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 b718ba2e671..228058e81fc 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet9",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet11",
+ "switch": null,
+ "switch_port": null,
"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 ddfe08170d6..2705d900aec 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet12",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet14",
+ "switch": null,
+ "switch_port": null,
"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 7106f7b8bc0..59de2ebac30 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet15",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet17",
+ "switch": null,
+ "switch_port": null,
"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 bf55890f627..b42eeec89d4 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet18",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet20",
+ "switch": null,
+ "switch_port": null,
"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 9fb384e36a2..c118e038ebe 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet21",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet23",
+ "switch": null,
+ "switch_port": null,
"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 f6c2cb80161..069c89f1f11 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet24",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet26",
+ "switch": null,
+ "switch_port": null,
"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 495566f21ae..a51e8e77040 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet27",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet29",
+ "switch": null,
+ "switch_port": null,
"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 fff418e2bd6..f9d3406c04e 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "sw-core",
- "switch_port": "Ethernet30",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "sw-core",
- "switch_port": "Ethernet32",
+ "switch": null,
+ "switch_port": null,
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
deleted file mode 100644
index 19ce0811c3b..00000000000
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
- "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": "core mgmt",
- "snmp_name": "Ethernet21",
- "uid": "sw"
- },
- {
- "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": "node",
- "port": "core",
- "snmp_name": "Ethernet48",
- "uid": "sw"
- }
- ],
- "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
deleted file mode 100644
index 15f39ca3920..00000000000
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
- "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": "node",
- "port": "admin",
- "snmp_name": "Ethernet36",
- "uid": "sw"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet40",
- "uid": "ramstein-1"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet44",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet48",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet52",
- "uid": "engelbourg-2"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet56",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet60",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet64",
- "uid": "engelbourg-3"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet68",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet72",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet76",
- "uid": "engelbourg-4"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet80",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet84",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet88",
- "uid": "engelbourg-5"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet92",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet96",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet100",
- "uid": "engelbourg-6"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet104",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet108",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet112",
- "uid": "engelbourg-7"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet116",
- "uid": "engelbourg-8"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "Ethernet120",
- "uid": "engelbourg-8"
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet124",
- "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
--
GitLab
From 8ce30da2d49a286346c30cf2ccdfb7ba69e41d37 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 23/47] [strasbourg][network] Add updated sw-admin and sw-core
yaml file
---
.../engelbourg/nodes/engelbourg-2.json | 4 +-
.../engelbourg/nodes/engelbourg-3.json | 4 +-
.../engelbourg/nodes/engelbourg-4.json | 4 +-
.../engelbourg/nodes/engelbourg-5.json | 4 +-
.../engelbourg/nodes/engelbourg-6.json | 4 +-
.../engelbourg/nodes/engelbourg-7.json | 4 +-
.../engelbourg/nodes/engelbourg-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-1.json | 8 +-
.../fleckenstein/nodes/fleckenstein-10.json | 8 +-
.../fleckenstein/nodes/fleckenstein-2.json | 8 +-
.../fleckenstein/nodes/fleckenstein-3.json | 8 +-
.../fleckenstein/nodes/fleckenstein-4.json | 8 +-
.../fleckenstein/nodes/fleckenstein-5.json | 8 +-
.../fleckenstein/nodes/fleckenstein-6.json | 8 +-
.../fleckenstein/nodes/fleckenstein-7.json | 8 +-
.../fleckenstein/nodes/fleckenstein-8.json | 8 +-
.../fleckenstein/nodes/fleckenstein-9.json | 8 +-
.../network_equipments/sw-admin.json | 248 ++++++++++
.../network_equipments/sw-core.json | 456 ++++++++++++++++++
.../sites/strasbourg/networks/sw-admin.yaml | 47 ++
.../sites/strasbourg/networks/sw-core.yaml | 91 ++++
21 files changed, 896 insertions(+), 54 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-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index c00f88ead52..15c00df06ba 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet44",
"vendor": "Intel"
},
{
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 7b93b299a72..8a9eb90d082 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet56",
"vendor": "Intel"
},
{
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 f4b694a0637..3d8fb01e747 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet68",
"vendor": "Intel"
},
{
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 0757c7f9ad0..3cd82abc1f8 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet80",
"vendor": "Intel"
},
{
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 7597028d121..5e07873dd58 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet92",
"vendor": "Intel"
},
{
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 7b58f37cf4a..b9ca5c2f5df 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet104",
"vendor": "Intel"
},
{
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 eb95256ace2..3da0f4933ad 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet116",
"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 e257b684fe3..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet6",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 556fb93eb5c..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet33",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 228058e81fc..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet9",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 2705d900aec..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet12",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 59de2ebac30..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet15",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 b42eeec89d4..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet18",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 c118e038ebe..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet21",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 069c89f1f11..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet24",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 a51e8e77040..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet27",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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 f9d3406c04e..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,8 +131,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-core",
+ "switch_port": "Ethernet30",
"vendor": "Intel"
},
{
@@ -171,8 +171,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": null,
- "switch_port": null,
+ "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..19ce0811c3b
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,248 @@
+{
+ "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": "core mgmt",
+ "snmp_name": "Ethernet21",
+ "uid": "sw"
+ },
+ {
+ "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": "node",
+ "port": "core",
+ "snmp_name": "Ethernet48",
+ "uid": "sw"
+ }
+ ],
+ "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..ce4a9581270
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,456 @@
+{
+ "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": "node",
+ "port": "admin",
+ "snmp_name": "Ethernet36",
+ "uid": "sw"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet40",
+ "uid": "ramstein-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet44",
+ "uid": "engelbourg-2"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet56",
+ "uid": "engelbourg-3"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet68",
+ "uid": "engelbourg-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet80",
+ "uid": "engelbourg-5"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet92",
+ "uid": "engelbourg-6"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet104",
+ "uid": "engelbourg-7"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "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..506bf5503e8
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,47 @@
+---
+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: sw-core mgmt
+ 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: sw-core
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..f630d1ac348
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,91 @@
+---
+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
+ 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: sw-admin
+ 40: ramstein-1
+ 44: engelbourg-2-eth0
+ 48:
+ 52:
+ 56: engelbourg-3-eth0
+ 60:
+ 64:
+ 68: engelbourg-4-eth0
+ 72:
+ 76:
+ 80: engelbourg-5-eth0
+ 84:
+ 88:
+ 92: engelbourg-6-eth0
+ 96:
+ 100:
+ 104: engelbourg-7-eth0
+ 108:
+ 112:
+ 116: engelbourg-8-eth0
+ 120:
+ 124:
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: srv-data
+ rate: 50000000000
+ kind: server
+
--
GitLab
From 1a9e0a4116750840236c35231fa54c44488ea13f Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 09:33:18 +0100
Subject: [PATCH 24/47] [strasbourg][network] Add correct rate for engelbourg
---
.../network_equipments/sw-core.json | 7 +++++
.../sites/strasbourg/networks/sw-core.yaml | 28 ++++++++++++++-----
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index ce4a9581270..fb2ad00fc3e 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -255,6 +255,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet44",
"uid": "engelbourg-2"
},
@@ -283,6 +284,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet56",
"uid": "engelbourg-3"
},
@@ -311,6 +313,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet68",
"uid": "engelbourg-4"
},
@@ -339,6 +342,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet80",
"uid": "engelbourg-5"
},
@@ -367,6 +371,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet92",
"uid": "engelbourg-6"
},
@@ -395,6 +400,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet104",
"uid": "engelbourg-7"
},
@@ -423,6 +429,7 @@
{
"kind": "node",
"port": "eth0",
+ "rate": 1000000000,
"snmp_name": "Ethernet116",
"uid": "engelbourg-8"
},
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index f630d1ac348..aea1115b03f 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -61,25 +61,39 @@ sw-core:
35: fleckenstein-10-eth2
36: sw-admin
40: ramstein-1
- 44: engelbourg-2-eth0
+ 44:
+ uid: engelbourg-2-eth0
+ rate: 1000000000
48:
52:
- 56: engelbourg-3-eth0
+ 56:
+ uid: engelbourg-3-eth0
+ rate: 1000000000
60:
64:
- 68: engelbourg-4-eth0
+ 68:
+ uid: engelbourg-4-eth0
+ rate: 1000000000
72:
76:
- 80: engelbourg-5-eth0
+ 80:
+ uid: engelbourg-5-eth0
+ rate: 1000000000
84:
88:
- 92: engelbourg-6-eth0
+ 92:
+ uid: engelbourg-6-eth0
+ rate: 1000000000
96:
100:
- 104: engelbourg-7-eth0
+ 104:
+ uid: engelbourg-7-eth0
+ rate: 1000000000
108:
112:
- 116: engelbourg-8-eth0
+ 116:
+ uid: engelbourg-8-eth0
+ rate: 1000000000
120:
124:
channels:
--
GitLab
From 3e47d3dd0221bee8c586f1ac8c54a4cfb71bf5eb Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 09:39:36 +0100
Subject: [PATCH 25/47] [strasbourg][network] Update switch description
---
input/grid5000/sites/strasbourg/networks/sw-admin.yaml | 6 ++++--
input/grid5000/sites/strasbourg/networks/sw-core.yaml | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index 506bf5503e8..7164b511f91 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -34,7 +34,7 @@ sw-admin:
18: engelbourg-7-bmc
19: engelbourg-8-bmc
20: ramstein-1
- 21: sw-core mgmt
+ 21: engelbourg-1
22: iotlab-devstrasbourg-bmc
23: inetlab-devaportnet-bmc
24: inetlab-stonet-bmc
@@ -44,4 +44,6 @@ sw-admin:
28: iotlab-strasbourg-bmc
29: iotlab-devwww-bmc
30: iotlab-www-bmc
- 48: sw-core
+ 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
index aea1115b03f..3225ef553a4 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -59,7 +59,9 @@ sw-core:
33: fleckenstein-10-eth0
34: fleckenstein-10-eth1
35: fleckenstein-10-eth2
- 36: sw-admin
+ 36:
+ uid: sw-admin
+ kind: switch
40: ramstein-1
44:
uid: engelbourg-2-eth0
@@ -82,7 +84,7 @@ sw-core:
84:
88:
92:
- uid: engelbourg-6-eth0
+ uid: engelbourg-6-eth0
rate: 1000000000
96:
100:
--
GitLab
From 3b1eebcaf7c8272ca5459d915dbea99cdce1ac62 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 09:56:21 +0100
Subject: [PATCH 26/47] [strasbourg][network] Correct typo
---
.../clusters/engelbourg/nodes/engelbourg-1.json | 4 ++--
.../sites/strasbourg/network_equipments/sw-admin.json | 9 ++++-----
.../sites/strasbourg/network_equipments/sw-core.json | 8 +++++---
input/grid5000/sites/strasbourg/networks/sw-core.yaml | 4 +++-
4 files changed, 14 insertions(+), 11 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 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/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index 19ce0811c3b..2adf8ce2c04 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -136,9 +136,9 @@
},
{
"kind": "node",
- "port": "core mgmt",
+ "port": "eth0",
"snmp_name": "Ethernet21",
- "uid": "sw"
+ "uid": "engelbourg-1"
},
{
"kind": "node",
@@ -229,10 +229,9 @@
{
},
{
- "kind": "node",
- "port": "core",
+ "kind": "switch",
"snmp_name": "Ethernet48",
- "uid": "sw"
+ "uid": "sw-core"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index fb2ad00fc3e..f7e9479217c 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -1,4 +1,7 @@
{
+ "alias": [
+ "engelbourg-1"
+ ],
"channels": {
"port-channel1": {
"kind": "server",
@@ -229,10 +232,9 @@
"uid": "fleckenstein-10"
},
{
- "kind": "node",
- "port": "admin",
+ "kind": "switch",
"snmp_name": "Ethernet36",
- "uid": "sw"
+ "uid": "sw-admin"
},
{
},
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index 3225ef553a4..82e22b7af23 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -7,6 +7,8 @@ sw-core:
kind: switch
managed_by_us: true
snmp_community: Unknown
+ alias:
+ - engelbourg-1
site: strasbourg
linecards:
1:
@@ -84,7 +86,7 @@ sw-core:
84:
88:
92:
- uid: engelbourg-6-eth0
+ uid: engelbourg-6-eth0
rate: 1000000000
96:
100:
--
GitLab
From e4f58c91988d7c8122bc860b4de948fa36621b48 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 27/47] [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 f9b7aec22bd1edbca61c210ff8440e91b6c92c7e 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 28/47] [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 74f405125e76322bf3a2485b01018854237bfb58 Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Thu, 27 Mar 2025 11:41:11 +0100
Subject: [PATCH 29/47] [Nantes] add cooling system metrics
---
.../sites/nantes/pdus/cooling-Z1.json | 51 ++++++++++++++++
.../grid5000/sites/nantes/pdus/pdu-Z1.10.json | 2 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.11.json | 4 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.20.json | 2 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.21.json | 4 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.40.json | 2 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.41.json | 4 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.50.json | 2 +-
.../grid5000/sites/nantes/pdus/pdu-Z1.51.json | 4 +-
input/grid5000/sites/nantes/pdus.yaml | 59 +++++++++++++++----
10 files changed, 110 insertions(+), 24 deletions(-)
create mode 100644 data/grid5000/sites/nantes/pdus/cooling-Z1.json
diff --git a/data/grid5000/sites/nantes/pdus/cooling-Z1.json b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
new file mode 100644
index 00000000000..182882d592a
--- /dev/null
+++ b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
@@ -0,0 +1,51 @@
+{
+ "ip": "192.168.1.17",
+ "mac": "00:c0:b7:f5:fa:63",
+ "metrics": [
+ {
+ "description": "Temperature in input of cooling system, in tenths of degrees Celsius",
+ "name": "cooling_input_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Temperature in output of cooling system, in tenths of degrees Celsius",
+ "name": "cooling_output_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Power consumption of cooling system, in tenths of kilowatt",
+ "name": "cooling_power_watt",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Sensor temperature reading, in tenths of degrees Celsius",
+ "name": "pdu_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%",
+ "protocol": "snmp"
+ }
+ }
+ ],
+ "model": "ACRD602",
+ "ports": {
+ "31": "pdu-Z1.20",
+ "33": "pdu-Z1.40",
+ "35": "pdu-Z1.50"
+ },
+ "type": "pdu",
+ "uid": "cooling-Z1",
+ "vendor": "APC"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
index c7c8bf99687..6b477e278b8 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"10": "ecotype-44",
"11": "ecotype-45",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
index 8fb267ac089..a9f7bc49355 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -12,7 +12,7 @@
}
},
{
- "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "description": "Sensor temperature reading, in tenths of degrees Celsius",
"name": "pdu_temperature_tenth_celsius",
"period": 5000,
"source": {
@@ -21,7 +21,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"1": "electrical_mgmt_board",
"10": "ecotype-44",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
index 74a344bd291..202b8fcd0ae 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"10": "ecotype-32",
"11": "ecotype-33",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
index db8d89410e0..a5a367549ce 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -12,7 +12,7 @@
}
},
{
- "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "description": "Sensor temperature reading, in tenths of degrees Celsius",
"name": "pdu_temperature_tenth_celsius",
"period": 5000,
"source": {
@@ -21,7 +21,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"1": "ecotype-prod2",
"10": "ecotype-32",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
index 5d2b5128c84..f59a05f0b74 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"1": "sw-ecotype-adm",
"10": "ecotype-20",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
index 790b361efbd..22e5d9056cc 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -12,7 +12,7 @@
}
},
{
- "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "description": "Sensor temperature reading, in tenths of degrees Celsius",
"name": "pdu_temperature_tenth_celsius",
"period": 5000,
"source": {
@@ -21,7 +21,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"10": "ecotype-20",
"11": "ecotype-21",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
index 6f3f0072c58..eea4d36b8b0 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"10": "ecotype-8",
"11": "ecotype-9",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
index ed3c16c2cc2..33c0699aa61 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -12,7 +12,7 @@
}
},
{
- "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "description": "Sensor temperature reading, in tenths of degrees Celsius",
"name": "pdu_temperature_tenth_celsius",
"period": 5000,
"source": {
@@ -21,7 +21,7 @@
}
}
],
- "model": "AP7940",
+ "model": "AP8453",
"ports": {
"1": "ecotype-prod2",
"10": "ecotype-8",
diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml
index bced731b582..4e653d3da02 100644
--- a/input/grid5000/sites/nantes/pdus.yaml
+++ b/input/grid5000/sites/nantes/pdus.yaml
@@ -2,7 +2,7 @@
pdus:
pdu-Z1.10:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -28,7 +28,7 @@ pdus:
pdu-Z1.11:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -37,7 +37,7 @@ pdus:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- name: pdu_temperature_tenth_celsius
- description: Sensor temperature reading in tenths of degrees Celsius
+ description: Sensor temperature reading, in tenths of degrees Celsius
period: 5000
source:
protocol: snmp
@@ -61,7 +61,7 @@ pdus:
pdu-Z1.20:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -87,7 +87,7 @@ pdus:
pdu-Z1.21:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -96,7 +96,7 @@ pdus:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- name: pdu_temperature_tenth_celsius
- description: Sensor temperature reading in tenths of degrees Celsius
+ description: Sensor temperature reading, in tenths of degrees Celsius
period: 5000
source:
protocol: snmp
@@ -119,7 +119,7 @@ pdus:
14: ecotype-36
pdu-Z1.40:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -146,7 +146,7 @@ pdus:
pdu-Z1.41:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -155,7 +155,7 @@ pdus:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- name: pdu_temperature_tenth_celsius
- description: Sensor temperature reading in tenths of degrees Celsius
+ description: Sensor temperature reading, in tenths of degrees Celsius
period: 5000
source:
protocol: snmp
@@ -178,7 +178,7 @@ pdus:
pdu-Z1.50:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -204,7 +204,7 @@ pdus:
pdu-Z1.51:
vendor: APC
- model: 'AP7940'
+ model: 'AP8453'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -213,7 +213,7 @@ pdus:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
- name: pdu_temperature_tenth_celsius
- description: Sensor temperature reading in tenths of degrees Celsius
+ description: Sensor temperature reading, in tenths of degrees Celsius
period: 5000
source:
protocol: snmp
@@ -234,3 +234,38 @@ pdus:
12: ecotype-10
13: ecotype-11
14: ecotype-12
+
+ cooling-Z1:
+ vendor: APC
+ model: 'ACRD602'
+ metrics:
+ - name: cooling_input_temperature_tenth_celsius
+ description: Temperature in input of cooling system, in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7
+ - name: cooling_output_temperature_tenth_celsius
+ description: Temperature in output of cooling system, in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9
+ - name: cooling_power_watt
+ description: Power consumption of cooling system, in tenths of kilowatt
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2
+ - name: pdu_temperature_tenth_celsius
+ description: Sensor temperature reading, in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%
+ ip: 192.168.1.17
+ mac: 00:c0:b7:f5:fa:63
+ ports:
+ 31: pdu-Z1.20
+ 33: pdu-Z1.40
+ 35: pdu-Z1.50
--
GitLab
From adaf1fd11344924efb70c7d2d601eb3f724ee552 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Thu, 27 Mar 2025 12:33:21 +0100
Subject: [PATCH 30/47] [sophia][esterel3] iDRAC update
---
.../sites/sophia/clusters/esterel3/nodes/esterel3-1.json | 2 +-
.../sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 5936ae13538..2e114fdca76 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -11,7 +11,7 @@
"vendor": "Dell Inc.",
"version": "2.18.2"
},
- "bmc_version": "2.85.85.85",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2016-06-06",
"manufacturer": "Dell Inc.",
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
index 9ead050b211..265d7a835c1 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
@@ -11,7 +11,7 @@ esterel3-1:
release_date: 10/18/2023
vendor: Dell Inc.
version: 2.18.2
- bmc_version: 2.85.85.85
+ bmc_version: 2.86.86.86
chassis:
manufacturer: Dell Inc.
name: PowerEdge T630
--
GitLab
From a4a36b15336b9f3a0867649d0d72bad63047240b Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Thu, 27 Mar 2025 15:00:35 +0100
Subject: [PATCH 31/47] [wiki] show the queue even for default in oar command
---
lib/refrepo/gen/wiki/generators/site_hardware.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 12ec69699e9..d66cf5b3936 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator
reservation_cmd = "\n{{Term|location=f#{site}|cmd="
reservation_cmd += "<code class=\"command\">oarsub</code> "
- reservation_cmd += "<code class=\"replace\">-q #{queue}</code> " if queue != 'default'
+ reservation_cmd += "<code class=\"replace\">-q #{queue}</code> "
reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first
reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> "
reservation_cmd += "<code>-I</code>"
--
GitLab
From 9fbe6061529e5ad6f0bec599945836a6b8fe49f6 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Fri, 28 Mar 2025 08:42:26 +0100
Subject: [PATCH 32/47] [sophia][esterel3] add secondary disk
---
.../sites/sophia/clusters/esterel3/esterel3.json | 2 +-
.../sophia/clusters/esterel3/nodes/esterel3-1.json | 11 +++++++++++
.../sites/sophia/clusters/esterel3/esterel3.yaml | 3 +++
.../sophia/clusters/esterel3/nodes/esterel3-1.yaml | 7 +++++++
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
index d71d423203b..81c613b81e2 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
@@ -80,7 +80,7 @@
],
"model": "Dell PowerEdge T630",
"nodes_count": 1,
- "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+ "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 372GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
"priority": 201706,
"queues": [
"admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 2e114fdca76..84c72b9c804 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -251,6 +251,17 @@
"size": 1999307276288,
"storage": "HDD",
"vendor": "Dell"
+ },
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x61866da05411b8001efab8882ea228d5",
+ "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
+ "id": "disk1",
+ "interface": "SATA",
+ "model": "PERC H730 Adp",
+ "size": 399431958528,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
index 90a02fbb166..c99208104a1 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
@@ -34,6 +34,9 @@ nodes:
pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
+ pci-0000:03:00.0-scsi-0:2:1:0:
+ id: disk1
+ interface: SATA
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
index 265d7a835c1..94de9a8e6b7 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
@@ -138,5 +138,12 @@ esterel3-1:
model: PERC H730 Adp
size: 1999307276288
storage: HDD
+ pci-0000:03:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x61866da05411b8001efab8882ea228d5"
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H730 Adp
+ size: 399431958528
+ storage: HDD
supported_job_types:
virtual: ivt
--
GitLab
From 05bb8ce5ae8c027cd1ca34eb7f01468ff12e4df7 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Fri, 28 Mar 2025 11:00:57 +0100
Subject: [PATCH 33/47] [sophia][esterel2,3,4] BIOS update
---
.../sites/sophia/clusters/esterel2/nodes/esterel2-1.json | 4 ++--
.../sites/sophia/clusters/esterel3/nodes/esterel3-1.json | 4 ++--
.../sites/sophia/clusters/esterel4/nodes/esterel4-1.json | 4 ++--
.../sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml | 4 ++--
.../sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml | 4 ++--
.../sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
index d27924d24d5..ee67a4bf2ef 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
@@ -7,9 +7,9 @@
"platform_type": "x86_64"
},
"bios": {
- "release_date": "10/18/2023",
+ "release_date": "02/22/2024",
"vendor": "Dell Inc.",
- "version": "2.18.2"
+ "version": "2.19.0"
},
"bmc_version": "2.86.86.86",
"chassis": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 84c72b9c804..57289116d12 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -7,9 +7,9 @@
"platform_type": "x86_64"
},
"bios": {
- "release_date": "10/18/2023",
+ "release_date": "02/22/2024",
"vendor": "Dell Inc.",
- "version": "2.18.2"
+ "version": "2.19.0"
},
"bmc_version": "2.86.86.86",
"chassis": {
diff --git a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
index 917a999c86e..a2ef1cca450 100644
--- a/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.json
@@ -7,9 +7,9 @@
"platform_type": "x86_64"
},
"bios": {
- "release_date": "10/18/2023",
+ "release_date": "02/22/2024",
"vendor": "Dell Inc.",
- "version": "2.18.2"
+ "version": "2.19.0"
},
"bmc_version": "2.86.86.86",
"chassis": {
diff --git a/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml b/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
index 6ffc8c2e5b8..9abf73995f9 100644
--- a/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.yaml
@@ -8,9 +8,9 @@ esterel2-1:
nb_threads: 24
platform_type: x86_64
bios:
- release_date: 10/18/2023
+ release_date: 02/22/2024
vendor: Dell Inc.
- version: 2.18.2
+ version: 2.19.0
bmc_version: 2.86.86.86
chassis:
manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
index 94de9a8e6b7..dc292d7ef07 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml
@@ -8,9 +8,9 @@ esterel3-1:
nb_threads: 40
platform_type: x86_64
bios:
- release_date: 10/18/2023
+ release_date: 02/22/2024
vendor: Dell Inc.
- version: 2.18.2
+ version: 2.19.0
bmc_version: 2.86.86.86
chassis:
manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml b/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
index a4fc5ae146d..091a944e35b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel4/nodes/esterel4-1.yaml
@@ -8,9 +8,9 @@ esterel4-1:
nb_threads: 40
platform_type: x86_64
bios:
- release_date: 10/18/2023
+ release_date: 02/22/2024
vendor: Dell Inc.
- version: 2.18.2
+ version: 2.19.0
bmc_version: 2.86.86.86
chassis:
manufacturer: Dell Inc.
--
GitLab
From 86ac7c99b2379db36c8da4dd322f62888d26e3a5 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Fri, 28 Mar 2025 09:19:21 +0100
Subject: [PATCH 34/47] [sophia][esterel3] Add to production queue
---
data/grid5000/accesses/nodesets.json | 55 +++++++++++++++++++
.../sophia/clusters/esterel3/esterel3.json | 2 +-
.../clusters/esterel3/nodes/esterel3-1.json | 4 +-
input/grid5000/access/sophia.yaml | 4 ++
.../sophia/clusters/esterel3/esterel3.yaml | 4 +-
5 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 80968b641f8..7147368d633 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1671,6 +1671,61 @@
]
}
},
+ "esterel3": {
+ "besteffort": {
+ "ggas": [
+ "cidre",
+ "kerdata",
+ "magellan",
+ "myriads",
+ "pacap",
+ "wide",
+ "pirat",
+ "coast",
+ "avalon",
+ "chroma",
+ "emeraude",
+ "maracas",
+ "inria-chile",
+ "inria-dsi",
+ "inria-sidf",
+ "swh",
+ "tadaam"
+ ],
+ "sites": [
+ "mc-rennes",
+ "mc-nancy",
+ "mc-lyon",
+ "mc-economic-activity",
+ "mc-sophia",
+ "mc-lille",
+ "mc-grenoble",
+ "mc-paris",
+ "mc-saclay",
+ "mc-bordeaux",
+ "mc-siege",
+ "mc-guest",
+ "slices-fr-grenoble",
+ "slices-fr-lille",
+ "slices-fr-lyon",
+ "slices-fr-nancy",
+ "slices-fr-nantes",
+ "slices-fr-rennes",
+ "slices-fr-sophia",
+ "slices-fr-strasbourg",
+ "slices-fr-toulouse"
+ ]
+ },
+ "p1": {
+ "ggas": [
+ "graphdeco"
+ ],
+ "sites": [
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ }
+ },
"esterel4": {
"besteffort": {
"ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
index 81c613b81e2..a71c4fd46a0 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json
@@ -84,7 +84,7 @@
"priority": 201706,
"queues": [
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
index 57289116d12..d09302dd28f 100644
--- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json
@@ -267,10 +267,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index f58ce1300e0..faaa381777c 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -25,6 +25,10 @@ esterel2: &dedicated-epione
p1: [epione, '@admin']
besteffort: ['@inria_group', '@other_groups_with_access']
+esterel3: &dedicated-graphdeco
+ p1: [graphdeco, '@admin']
+ besteffort: ['@inria_group', '@other_groups_with_access']
+
esterel5: &dedicated-stars
p1: [stars, '@admin']
besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
index c99208104a1..931d73ea6c2 100644
--- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml
@@ -6,13 +6,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
esterel3-1:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Broadwell
clock_speed: 2_200_000_000
--
GitLab
From 546fa225447fee38ee63303503ec68aabaf4bb9b Mon Sep 17 00:00:00 2001
From: PARISOT Clement <clement.parisot@inria.fr>
Date: Fri, 14 Mar 2025 15:20:44 +0100
Subject: [PATCH 35/47] [grenoble] Add new cluster chartreuse3
---
.../clusters/chartreuse3/chartreuse3.json | 66 +++++++++
.../chartreuse3/nodes/chartreuse3-1.json | 128 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-2.json | 128 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-3.json | 128 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-4.json | 128 ++++++++++++++++++
.../clusters/chartreuse3/chartreuse3.yaml | 41 ++++++
.../chartreuse3/chartreuse3_metrics.yaml | 42 ++++++
.../clusters/chartreuse3/nodes.yaml.erb | 86 ++++++++++++
8 files changed, 747 insertions(+)
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
new file mode 100644
index 00000000000..d73c0c3c128
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -0,0 +1,66 @@
+{
+ "boot_type": "uefi",
+ "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "exotic": false,
+ "kavlan": false,
+ "manufactured_at": "1970-01-01",
+ "metrics": [
+ {
+ "description": "Default subset of metrics from Prometheus Node Exporter",
+ "name": "prom_default_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "id": [
+ "node_boot_time_seconds",
+ "node_cpu_scaling_frequency_hertz",
+ "node_cpu_seconds_total",
+ "node_filesystem_free_bytes",
+ "node_filesystem_size_bytes",
+ "node_load1",
+ "node_load15",
+ "node_load5",
+ "node_memory_Buffers_bytes",
+ "node_memory_Cached_bytes",
+ "node_memory_MemAvailable_bytes",
+ "node_memory_MemFree_bytes",
+ "node_memory_MemTotal_bytes",
+ "node_memory_Shmem_bytes",
+ "node_memory_SwapFree_bytes",
+ "node_memory_SwapTotal_bytes",
+ "node_network_receive_bytes_total",
+ "node_network_receive_packets_total",
+ "node_network_transmit_bytes_total",
+ "node_network_transmit_packets_total",
+ "node_procs_blocked",
+ "node_procs_running",
+ "kwollect_custom"
+ ],
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ },
+ {
+ "description": "All metrics from Prometheus Node Exporter",
+ "name": "prom_all_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ }
+ ],
+ "model": "Cluster Model",
+ "nodes_count": 4,
+ "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": "chartreuse3",
+ "warranty_end": "1970-01-01"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
new file mode 100644
index 00000000000..d4981bc34d4
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-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": false,
+ "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.26.9",
+ "ip6": "2001:660:4406:100:b::9",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:6f:b6",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-1.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.9",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:6f:ba",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-1-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 128,
+ "node_flops": 9216
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 8,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "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": "chartreuse3-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
new file mode 100644
index 00000000000..0f5ddc4a084
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-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": false,
+ "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.26.10",
+ "ip6": "2001:660:4406:100:b::a",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:97:4c",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-2.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.10",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:97:50",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-2-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 128,
+ "node_flops": 9216
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 8,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "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": "chartreuse3-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
new file mode 100644
index 00000000000..bdb943dabe0
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-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": false,
+ "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.26.11",
+ "ip6": "2001:660:4406:100:b::b",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:7c:ac",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-3.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.11",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:7c:b0",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-3-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 128,
+ "node_flops": 9216
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 8,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "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": "chartreuse3-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
new file mode 100644
index 00000000000..f96a177ffc8
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-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": false,
+ "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.26.12",
+ "ip6": "2001:660:4406:100:b::c",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:9b:06",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-4.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.12",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:9b:0a",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-4-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 128,
+ "node_flops": 9216
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 8,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "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": "chartreuse3-4"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
new file mode 100644
index 00000000000..c6dcbe9d524
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -0,0 +1,41 @@
+---
+model: Cluster Model # TODO: change this value.
+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: false # TODO: specify if 'true' or 'false'
+queues:
+ - admin
+ - testing
+nodes:
+ chartreuse3-[1-4]:
+ chassis:
+ manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
+ warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
+ supported_job_types:
+ deploy: true
+ besteffort: true
+ max_walltime: 0
+ processor:
+ microarchitecture: Haswell # TODO: replace with microarch name.
+ clock_speed: 8 # TODO: Replace with clock speed.
+ network_adapters:
+ bmc:
+ interface: Ethernet
+ 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: chartreuse3
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml
new file mode 100644
index 00000000000..3c11d0073c1
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+ - name: prom_default_metrics
+ description: Default subset of metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
+ id:
+ - node_boot_time_seconds
+ - node_cpu_scaling_frequency_hertz
+ - node_cpu_seconds_total
+ - node_filesystem_free_bytes
+ - node_filesystem_size_bytes
+ - node_load1
+ - node_load15
+ - node_load5
+ - node_memory_Buffers_bytes
+ - node_memory_Cached_bytes
+ - node_memory_MemAvailable_bytes
+ - node_memory_MemFree_bytes
+ - node_memory_MemTotal_bytes
+ - node_memory_Shmem_bytes
+ - node_memory_SwapFree_bytes
+ - node_memory_SwapTotal_bytes
+ - node_network_receive_bytes_total
+ - node_network_receive_packets_total
+ - node_network_transmit_bytes_total
+ - node_network_transmit_packets_total
+ - node_procs_blocked
+ - node_procs_running
+ - kwollect_custom
+
+ - name: prom_all_metrics
+ description: All metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
new file mode 100644
index 00000000000..dbbe1044924
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
@@ -0,0 +1,86 @@
+<%
+ # File generated by 'rake mass:create SRC=mass-create-2025-03-14.csv
+ # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
+
+ cluster_name = "chartreuse3"
+ nodes_number = 4 # Size of the cluster (number of nodes)
+ # MAC addresses declaration
+ mac_eth0_list = %w(
+00:8c:fa:fd:6f:b6
+00:8c:fa:fe:97:4c
+00:8c:fa:fd:7c:ac
+00:8c:fa:fe:9b:06
+ )
+ mac_bmc_list = %w(
+00:8c:fa:fd:6f:ba
+00:8c:fa:fe:97:50
+00:8c:fa:fd:7c:b0
+00:8c:fa:fe:9b:0a
+ )
+%>
+---
+nodes:
+<% (1..nodes_number).each { |i| %>
+ <%= cluster_name %>-<%= i %>:
+ architecture:
+ nb_procs: 1 # Fake data, will be replaced by g5k-checks
+ nb_cores: 72 # Fake data, will be replaced by g5k-checks
+ nb_threads: 72 # Fake data, will be replaced by g5k-checks
+ platform_type: x86_64 # Fake data, will be replaced by g5k-checks
+ cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
+ bios:
+ release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
+ vendor: Unknown # Fake vendor, will be replaced by g5k-checks
+ version: 1 # Fake version, will be replaced by g5k-checks
+ bmc_version: v1 # Fake version, will be replaced by g5k-checks
+ chassis:
+ manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
+ name: Unknown # Fake name, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake size, will be replaced by g5k-checks
+ memory_devices:
+ dimm:
+ size: 8 # Fake size, will be replaced by g5k-checks
+ technology: dram # Common memory technology, will be replaced by g5k-checks
+ processor:
+ model: Unknown # Fake model name, will be replaced by g5k-checks
+ other_description: description # Fake description, will be replaced by g5k-checks
+ vendor: vendor # Fake vendor, will be replaced by g5k-checks
+ version: vendor # Fake version, will be replaced by g5k-checks
+ cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l2: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l3: 8 # Fake cache, will be replaced by g5k-checks
+ instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
+ microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
+ ht_capable: true # Default ht capable value, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake ram size, will be replaced by g5k-checks
+ memory_devices:
+ dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
+ size: 8 # Fake dimm size, will be replaced by g5k-checks
+ technology: dram # Default dimm technology, will be replaced by g5k-checks
+ operating_system:
+ cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
+ cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
+ ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
+ pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
+ pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
+ turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
+ network_adapters:
+ bmc:
+ management: true
+ mac: <%= mac_bmc_list[i - 1] %>
+ eth0:
+ interface: Ethernet
+ management: false
+ driver: mlx_core # Fake data, will be replaced by g5k-checks
+ name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks
+ rate: 10000000000 # Fake data, will be replaced by g5k-checks
+ mac: <%= mac_eth0_list[i - 1] %>
+ storage_devices:
+ disk0:
+ storage: SSD # Fake data, will be replaced by g5k-checks
+ model: unknown # Fake data, will be replaced by g5k-checks
+ size: 8 # Fake data, will be replaced by g5k-checks
+<% } %>
--
GitLab
From 89ddca8be0bbc9dc68e7373f13d0559b996a898f Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Thu, 20 Mar 2025 09:00:20 +0100
Subject: [PATCH 36/47] [Grenoble][Chartreuse3] Add cluster chartreuse3
---
.../clusters/chartreuse3/chartreuse3.json | 12 +++++------
.../chartreuse3/nodes/chartreuse3-1.json | 14 ++++++-------
.../chartreuse3/nodes/chartreuse3-2.json | 14 ++++++-------
.../chartreuse3/nodes/chartreuse3-3.json | 14 ++++++-------
.../chartreuse3/nodes/chartreuse3-4.json | 14 ++++++-------
.../clusters/chartreuse3/chartreuse3.yaml | 20 +++++++++----------
6 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
index d73c0c3c128..cf10965f9c2 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -1,9 +1,9 @@
{
- "boot_type": "uefi",
- "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "boot_type": "bios",
+ "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
"exotic": false,
"kavlan": false,
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-03-28",
"metrics": [
{
"description": "Default subset of metrics from Prometheus Node Exporter",
@@ -51,10 +51,10 @@
}
}
],
- "model": "Cluster Model",
+ "model": "Dell PowerEdge C6320",
"nodes_count": 4,
"nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
- "priority": 197001,
+ "priority": 201603,
"queues": [
"admin",
"testing"
@@ -62,5 +62,5 @@
"redfish": true,
"type": "cluster",
"uid": "chartreuse3",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2019-03-28"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index d4981bc34d4..9a1431acb65 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-03-28",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2019-03-28"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 38400000000,
+ "node_flops": 2764800000000
},
"processor": {
"cache_l1": null,
@@ -86,10 +86,10 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Broadwell",
"microcode": "0xd000001",
"model": "Unknown",
"other_description": "description",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index 0f5ddc4a084..d5e05397cee 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-03-28",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2019-03-28"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 38400000000,
+ "node_flops": 2764800000000
},
"processor": {
"cache_l1": null,
@@ -86,10 +86,10 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Broadwell",
"microcode": "0xd000001",
"model": "Unknown",
"other_description": "description",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index bdb943dabe0..ab23d2304b1 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-03-28",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2019-03-28"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 38400000000,
+ "node_flops": 2764800000000
},
"processor": {
"cache_l1": null,
@@ -86,10 +86,10 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Broadwell",
"microcode": "0xd000001",
"model": "Unknown",
"other_description": "description",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index f96a177ffc8..66bf1adc3a8 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-03-28",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2019-03-28"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 38400000000,
+ "node_flops": 2764800000000
},
"processor": {
"cache_l1": null,
@@ -86,10 +86,10 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Haswell",
+ "microarchitecture": "Broadwell",
"microcode": "0xd000001",
"model": "Unknown",
"other_description": "description",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
index c6dcbe9d524..da30d36a045 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -1,24 +1,24 @@
---
-model: Cluster Model # TODO: change this value.
-created_at: 1970-01-01 # TODO: change this value
+model: Dell PowerEdge C6320
+created_at: 2025-03-20
kavlan: false
-boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
-exotic: false # TODO: specify if 'true' or 'false'
+boot_type: bios
+exotic: false
queues:
- admin
- testing
nodes:
chartreuse3-[1-4]:
chassis:
- manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
- warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
+ manufactured_at: 2016-03-28
+ warranty_end: 2019-03-28
supported_job_types:
deploy: true
besteffort: true
max_walltime: 0
processor:
- microarchitecture: Haswell # TODO: replace with microarch name.
- clock_speed: 8 # TODO: Replace with clock speed.
+ microarchitecture: Broadwell
+ clock_speed: 2400000000
network_adapters:
bmc:
interface: Ethernet
@@ -35,7 +35,7 @@ nodes:
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
+ standard-environment: debian11-x64-std
management_tools:
- bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ bmc_vendor_tool: racadm
nodeset: chartreuse3
--
GitLab
From df2f9d68f9c689ce35734f02c4c32bd05aec3467 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 24 Mar 2025 09:31:19 +0100
Subject: [PATCH 37/47] [Grenoble][Chartreuse3] Add cluster to switch
---
.../chartreuse3/nodes/chartreuse3-1.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-2.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-3.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-4.json | 4 ++--
.../imag-1b-F3-prod-01.json | 20 +++++++++++++++++++
.../grenoble/networks/imag-1b-F3-prod-01.yaml | 12 +++++++++++
6 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index 9a1431acb65..9d334ca6dbf 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-1.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/12"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index d5e05397cee..8af9036651e 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-2.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/9"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index ab23d2304b1..2980d44b8f9 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-3.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/10"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index 66bf1adc3a8..5281471e038 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-4.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/11"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index 2e0e697d3dd..e20fdc6efe5 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -65,12 +65,32 @@
"uid": "chartreuse2-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/9",
+ "uid": "chartreuse3-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/10",
+ "uid": "chartreuse3-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/11",
+ "uid": "chartreuse3-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/12",
+ "uid": "chartreuse3-1"
},
{
},
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index 71d1e0074e4..744e97bbd89 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -35,6 +35,18 @@ imag-1b-F3-prod-01:
8:
uid: chartreuse2-4
rate: 10_000_000_000
+ 9:
+ uid: chartreuse3-2
+ rate: 10_000_000_000
+ 10:
+ uid: chartreuse3-3
+ rate: 10_000_000_000
+ 11:
+ uid: chartreuse3-4
+ rate: 10_000_000_000
+ 12:
+ uid: chartreuse3-1
+ rate: 10_000_000_000
22:
uid: nessie-1
39:
--
GitLab
From 1d136b18027f1b3f3becf316bbef071a765e09d5 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Wed, 26 Mar 2025 15:32:07 +0100
Subject: [PATCH 38/47] [Grenoble][Chartreuse3] Add path disk
---
.../grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json | 2 +-
.../grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json | 2 +-
.../grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json | 2 +-
.../grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json | 2 +-
.../sites/grenoble/clusters/chartreuse3/chartreuse3.yaml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index 9d334ca6dbf..106de087f95 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-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:02:00.0-sas-phy0-lun-0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index 8af9036651e..12e97de7c40 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index 2980d44b8f9..45579e9cc0a 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index 5281471e038..9a1e54b24d2 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -105,7 +105,7 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
index da30d36a045..e88894b3b92 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -33,7 +33,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:02:00.0-sas-phy0-lun-0"
software:
standard-environment: debian11-x64-std
management_tools:
--
GitLab
From 064b912767e7f0e792627973b26b5d0ea09d6669 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Thu, 27 Mar 2025 15:41:27 +0100
Subject: [PATCH 39/47] [Grenoble][Chartreuse3] Add disk and generate nodes
informations
---
.../clusters/chartreuse3/chartreuse3.json | 2 +-
.../chartreuse3/nodes/chartreuse3-1.json | 128 ------------------
.../chartreuse3/nodes/chartreuse3-2.json | 128 ------------------
.../chartreuse3/nodes/chartreuse3-3.json | 128 ------------------
.../chartreuse3/nodes/chartreuse3-4.json | 128 ------------------
input/grid5000/dell-product-data.yaml | 18 +++
input/grid5000/disks.yaml | 1 +
.../clusters/chartreuse3/chartreuse3.yaml | 14 +-
.../clusters/chartreuse3/nodes.yaml.erb | 86 ------------
.../chartreuse3/nodes/chartreuse3-1.yaml | 91 +++++++++++++
.../chartreuse3/nodes/chartreuse3-2.yaml | 91 +++++++++++++
.../chartreuse3/nodes/chartreuse3-3.yaml | 91 +++++++++++++
.../chartreuse3/nodes/chartreuse3-4.yaml | 91 +++++++++++++
lib/refrepo/net_names_mapping.yaml | 3 +
14 files changed, 394 insertions(+), 606 deletions(-)
delete mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
delete mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
delete mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
delete mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
delete mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
create mode 100644 input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
index cf10965f9c2..1c81cf91723 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -53,7 +53,7 @@
],
"model": "Dell PowerEdge C6320",
"nodes_count": 4,
- "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
+ "nodes_description": "2 CPUs Intel Xeon E5-2640 v3, 8 cores/CPU, 64GB RAM, 1117GB HDD, 1 x 10Gb Ethernet",
"priority": 201603,
"queues": [
"admin",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
deleted file mode 100644
index 106de087f95..00000000000
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "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": "2016-03-28",
- "manufacturer": "Unknown",
- "name": "Unknown",
- "warranty_end": "2019-03-28"
- },
- "exotic": false,
- "main_memory": {
- "ram_size": 8
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "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.26.9",
- "ip6": "2001:660:4406:100:b::9",
- "kavlan": false,
- "mac": "00:8c:fa:fd:6f:b6",
- "management": false,
- "mountable": true,
- "mounted": true,
- "name": "enp1s0f0np0",
- "network_address": "chartreuse3-1.grenoble.grid5000.fr",
- "rate": 10000000000,
- "switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/12"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.9",
- "kavlan": false,
- "mac": "00:8c:fa:fd:6f:ba",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse3-1-bmc.grenoble.grid5000.fr"
- }
- ],
- "nodeset": "chartreuse3",
- "operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
- "ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
- },
- "performance": {
- "core_flops": 38400000000,
- "node_flops": 2764800000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
- "clock_speed": 2400000000,
- "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/pci-0000:02:00.0-sas-phy0-lun-0",
- "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": "chartreuse3-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
deleted file mode 100644
index 12e97de7c40..00000000000
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "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": "2016-03-28",
- "manufacturer": "Unknown",
- "name": "Unknown",
- "warranty_end": "2019-03-28"
- },
- "exotic": false,
- "main_memory": {
- "ram_size": 8
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "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.26.10",
- "ip6": "2001:660:4406:100:b::a",
- "kavlan": false,
- "mac": "00:8c:fa:fe:97:4c",
- "management": false,
- "mountable": true,
- "mounted": true,
- "name": "enp1s0f0np0",
- "network_address": "chartreuse3-2.grenoble.grid5000.fr",
- "rate": 10000000000,
- "switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/9"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.10",
- "kavlan": false,
- "mac": "00:8c:fa:fe:97:50",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse3-2-bmc.grenoble.grid5000.fr"
- }
- ],
- "nodeset": "chartreuse3",
- "operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
- "ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
- },
- "performance": {
- "core_flops": 38400000000,
- "node_flops": 2764800000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
- "clock_speed": 2400000000,
- "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/pci-0000:02:00.0-sas-phy0-lun-0",
- "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": "chartreuse3-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
deleted file mode 100644
index 45579e9cc0a..00000000000
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "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": "2016-03-28",
- "manufacturer": "Unknown",
- "name": "Unknown",
- "warranty_end": "2019-03-28"
- },
- "exotic": false,
- "main_memory": {
- "ram_size": 8
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "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.26.11",
- "ip6": "2001:660:4406:100:b::b",
- "kavlan": false,
- "mac": "00:8c:fa:fd:7c:ac",
- "management": false,
- "mountable": true,
- "mounted": true,
- "name": "enp1s0f0np0",
- "network_address": "chartreuse3-3.grenoble.grid5000.fr",
- "rate": 10000000000,
- "switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/10"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.11",
- "kavlan": false,
- "mac": "00:8c:fa:fd:7c:b0",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse3-3-bmc.grenoble.grid5000.fr"
- }
- ],
- "nodeset": "chartreuse3",
- "operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
- "ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
- },
- "performance": {
- "core_flops": 38400000000,
- "node_flops": 2764800000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
- "clock_speed": 2400000000,
- "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/pci-0000:02:00.0-sas-phy0-lun-0",
- "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": "chartreuse3-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
deleted file mode 100644
index 9a1e54b24d2..00000000000
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "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": "2016-03-28",
- "manufacturer": "Unknown",
- "name": "Unknown",
- "warranty_end": "2019-03-28"
- },
- "exotic": false,
- "main_memory": {
- "ram_size": 8
- },
- "management_tools": {
- "bmc_vendor_tool": "racadm",
- "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.26.12",
- "ip6": "2001:660:4406:100:b::c",
- "kavlan": false,
- "mac": "00:8c:fa:fe:9b:06",
- "management": false,
- "mountable": true,
- "mounted": true,
- "name": "enp1s0f0np0",
- "network_address": "chartreuse3-4.grenoble.grid5000.fr",
- "rate": 10000000000,
- "switch": "imag-1b-F3-prod-01",
- "switch_port": "1/1/11"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.26.12",
- "kavlan": false,
- "mac": "00:8c:fa:fe:9b:0a",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "chartreuse3-4-bmc.grenoble.grid5000.fr"
- }
- ],
- "nodeset": "chartreuse3",
- "operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
- "ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
- "turboboost_enabled": true
- },
- "performance": {
- "core_flops": 38400000000,
- "node_flops": 2764800000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
- "clock_speed": 2400000000,
- "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/pci-0000:02:00.0-sas-phy0-lun-0",
- "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": "chartreuse3-4"
-}
\ No newline at end of file
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 1548aa6b2ed..852d67134b5 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -20,6 +20,24 @@ sites:
chassis:
manufactured_at: 2016-11-14
warranty_end: 2021-11-13
+ chartreuse3:
+ nodes:
+ chartreuse3-1:
+ chassis:
+ manufactured_at: 2016-03-28
+ warranty_end: 2019-03-28
+ chartreuse3-2:
+ chassis:
+ manufactured_at: 2016-03-28
+ warranty_end: 2019-03-28
+ chartreuse3-3:
+ chassis:
+ manufactured_at: 2016-03-28
+ warranty_end: 2019-03-28
+ chartreuse3-4:
+ chassis:
+ manufactured_at: 2016-03-28
+ warranty_end: 2019-03-28
dahu:
nodes:
dahu-1:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 83d9bb837fe..214d76ee967 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -51,6 +51,7 @@ disk_vendor_model_mapping:
- ST4000NM0295
- ST8000NM0185
- ST2000NM013A
+ - ST1200MM0007
Toshiba:
- PX02SSF020
- PX04SHB020
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
index e88894b3b92..d826a5eff0f 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -9,16 +9,13 @@ queues:
- testing
nodes:
chartreuse3-[1-4]:
- chassis:
- manufactured_at: 2016-03-28
- warranty_end: 2019-03-28
supported_job_types:
deploy: true
besteffort: true
max_walltime: 0
processor:
- microarchitecture: Broadwell
- clock_speed: 2400000000
+ microarchitecture: Haswell
+ clock_speed: 2_600_000_000
network_adapters:
bmc:
interface: Ethernet
@@ -29,11 +26,14 @@ nodes:
enabled: true
mountable: true
mounted: true
+ eth1:
+ enabled: false
+ mountable: false
+ mounted: false
storage_devices:
- disk0: # This field will have to be renamed later.
+ pci-0000:02:00.0-sas-phy0-lun-0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
deleted file mode 100644
index dbbe1044924..00000000000
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes.yaml.erb
+++ /dev/null
@@ -1,86 +0,0 @@
-<%
- # File generated by 'rake mass:create SRC=mass-create-2025-03-14.csv
- # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
-
- cluster_name = "chartreuse3"
- nodes_number = 4 # Size of the cluster (number of nodes)
- # MAC addresses declaration
- mac_eth0_list = %w(
-00:8c:fa:fd:6f:b6
-00:8c:fa:fe:97:4c
-00:8c:fa:fd:7c:ac
-00:8c:fa:fe:9b:06
- )
- mac_bmc_list = %w(
-00:8c:fa:fd:6f:ba
-00:8c:fa:fe:97:50
-00:8c:fa:fd:7c:b0
-00:8c:fa:fe:9b:0a
- )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
- architecture:
- nb_procs: 1 # Fake data, will be replaced by g5k-checks
- nb_cores: 72 # Fake data, will be replaced by g5k-checks
- nb_threads: 72 # Fake data, will be replaced by g5k-checks
- platform_type: x86_64 # Fake data, will be replaced by g5k-checks
- cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
- bios:
- release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
- vendor: Unknown # Fake vendor, will be replaced by g5k-checks
- version: 1 # Fake version, will be replaced by g5k-checks
- bmc_version: v1 # Fake version, will be replaced by g5k-checks
- chassis:
- manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
- name: Unknown # Fake name, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake size, will be replaced by g5k-checks
- memory_devices:
- dimm:
- size: 8 # Fake size, will be replaced by g5k-checks
- technology: dram # Common memory technology, will be replaced by g5k-checks
- processor:
- model: Unknown # Fake model name, will be replaced by g5k-checks
- other_description: description # Fake description, will be replaced by g5k-checks
- vendor: vendor # Fake vendor, will be replaced by g5k-checks
- version: vendor # Fake version, will be replaced by g5k-checks
- cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
- cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
- cache_l2: 8 # Fake cache, will be replaced by g5k-checks
- cache_l3: 8 # Fake cache, will be replaced by g5k-checks
- instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
- microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
- ht_capable: true # Default ht capable value, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake ram size, will be replaced by g5k-checks
- memory_devices:
- dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
- size: 8 # Fake dimm size, will be replaced by g5k-checks
- technology: dram # Default dimm technology, will be replaced by g5k-checks
- operating_system:
- cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
- cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
- ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
- pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
- pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
- turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
- network_adapters:
- bmc:
- management: true
- mac: <%= mac_bmc_list[i - 1] %>
- eth0:
- interface: Ethernet
- management: false
- driver: mlx_core # Fake data, will be replaced by g5k-checks
- name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks
- rate: 10000000000 # Fake data, will be replaced by g5k-checks
- mac: <%= mac_eth0_list[i - 1] %>
- storage_devices:
- disk0:
- storage: SSD # Fake data, will be replaced by g5k-checks
- model: unknown # Fake data, will be replaced by g5k-checks
- size: 8 # Fake data, will be replaced by g5k-checks
-<% } %>
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
new file mode 100644
index 00000000000..e32ea649167
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 16
+ nb_procs: 2
+ nb_threads: 32
+ platform_type: x86_64
+ bios:
+ release_date: 03/18/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 16MCWC2
+ main_memory:
+ ram_size: 68719476736
+ memory_devices:
+ dimm_a1:
+ size: 17179869184
+ technology: dram
+ dimm_a2:
+ size: 17179869184
+ technology: dram
+ dimm_b1:
+ size: 17179869184
+ technology: dram
+ dimm_b2:
+ size: 17179869184
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.9
+ mac: 00:8c:fa:fd:6f:ba
+ management: true
+ eth1:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 00:8c:fa:fd:6f:b8
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.9
+ mac: 00:8c:fa:fd:6f:b6
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 20971520
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x49'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+ vendor: Intel
+ version: E5-2640 v3
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x5000c5008e71a54f"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: IS06
+ model: ST1200MM0007
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
new file mode 100644
index 00000000000..fb47055af7d
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-2:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 16
+ nb_procs: 2
+ nb_threads: 32
+ platform_type: x86_64
+ bios:
+ release_date: 03/18/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 16P9WC2
+ main_memory:
+ ram_size: 68719476736
+ memory_devices:
+ dimm_a1:
+ size: 17179869184
+ technology: dram
+ dimm_a2:
+ size: 17179869184
+ technology: dram
+ dimm_b1:
+ size: 17179869184
+ technology: dram
+ dimm_b2:
+ size: 17179869184
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.10
+ mac: 00:8c:fa:fe:97:50
+ management: true
+ eth1:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 00:8c:fa:fe:97:4e
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.10
+ mac: 00:8c:fa:fe:97:4c
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 20971520
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x49'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+ vendor: Intel
+ version: E5-2640 v3
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x5000c5008e7fd4cf"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: IS06
+ model: ST1200MM0007
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
new file mode 100644
index 00000000000..79157b3e65a
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-3:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 16
+ nb_procs: 2
+ nb_threads: 32
+ platform_type: x86_64
+ bios:
+ release_date: 03/18/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 16NGWC2
+ main_memory:
+ ram_size: 68719476736
+ memory_devices:
+ dimm_a1:
+ size: 17179869184
+ technology: dram
+ dimm_a2:
+ size: 17179869184
+ technology: dram
+ dimm_b1:
+ size: 17179869184
+ technology: dram
+ dimm_b2:
+ size: 17179869184
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.11
+ mac: 00:8c:fa:fd:7c:b0
+ management: true
+ eth1:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 00:8c:fa:fd:7c:ae
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.11
+ mac: 00:8c:fa:fd:7c:ac
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 20971520
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x49'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+ vendor: Intel
+ version: E5-2640 v3
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x5000c5008e72e577"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: IS06
+ model: ST1200MM0007
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
new file mode 100644
index 00000000000..5ba60c8cd81
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
@@ -0,0 +1,91 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+chartreuse3-4:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 16
+ nb_procs: 2
+ nb_threads: 32
+ platform_type: x86_64
+ bios:
+ release_date: 03/18/2024
+ vendor: Dell Inc.
+ version: 2.19.0
+ bmc_version: 2.86.86.86
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6320
+ serial: 16PFWC2
+ main_memory:
+ ram_size: 68719476736
+ memory_devices:
+ dimm_a1:
+ size: 17179869184
+ technology: dram
+ dimm_a2:
+ size: 17179869184
+ technology: dram
+ dimm_b1:
+ size: 17179869184
+ technology: dram
+ dimm_b2:
+ size: 17179869184
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.26.12
+ mac: 00:8c:fa:fe:9b:0a
+ management: true
+ eth1:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ mac: 00:8c:fa:fe:9b:08
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: eno2
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ eth0:
+ driver: ixgbe
+ firmware_version: 0x8000095e, 18.5.18
+ interface: Ethernet
+ ip: 172.16.26.12
+ mac: 00:8c:fa:fe:9b:06
+ management: false
+ model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
+ name: enp1s0f0np0
+ rate: 10000000000
+ sriov: true
+ sriov_totalvfs: 63
+ vendor: Intel
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_cpufreq
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 262144
+ cache_l3: 20971520
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x49'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz
+ vendor: Intel
+ version: E5-2640 v3
+ storage_devices:
+ pci-0000:02:00.0-sas-phy0-lun-0:
+ by_id: "/dev/disk/by-id/wwn-0x5000c5008e80589b"
+ by_path: "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0"
+ firmware_version: IS06
+ model: ST1200MM0007
+ size: 1200243695616
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 6fa97749576..af7c985a69d 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -120,6 +120,9 @@ drac:
chartreuse2:
enp129s0f0: eth0
enp129s0f1: eth1
+chartreuse3:
+ enp129s0f0: eth0
+ enp129s0f1: eth1
econome:
eno1: eth2
eno2: eth3
--
GitLab
From a55d870735665db1d041b33ce5a8d50777856165 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 31 Mar 2025 08:21:35 +0200
Subject: [PATCH 40/47] [Grenoble][Chartreuse3] Regenerate refapi
---
.../chartreuse3/nodes/chartreuse3-1.json | 168 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-2.json | 168 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-3.json | 168 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-4.json | 168 ++++++++++++++++++
.../chartreuse3/nodes/chartreuse3-1.yaml | 2 +-
.../chartreuse3/nodes/chartreuse3-2.yaml | 2 +-
.../chartreuse3/nodes/chartreuse3-3.yaml | 2 +-
.../chartreuse3/nodes/chartreuse3-4.yaml | 2 +-
8 files changed, 676 insertions(+), 4 deletions(-)
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
create mode 100644 data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
new file mode 100644
index 00000000000..89515f13314
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -0,0 +1,168 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 16,
+ "nb_procs": 2,
+ "nb_threads": 32,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
+ },
+ "bmc_version": "2.86.86.86",
+ "chassis": {
+ "manufactured_at": "2016-03-28",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "16MCWC2",
+ "warranty_end": "2019-03-28"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 68719476736
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_a1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "ixgbe",
+ "enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "ip": "172.16.26.9",
+ "ip6": "2001:660:4406:100:b::9",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:6f:b6",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-1.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/12",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:6f:b8",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.9",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:6f:ba",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-1-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 41600000000,
+ "node_flops": 665600000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 20971520,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "microcode": "0x49",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v3"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025032008",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x5000c5008e71a54f",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "IS06",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "ST1200MM0007",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Seagate"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "chartreuse3-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
new file mode 100644
index 00000000000..e4e7de88b80
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -0,0 +1,168 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 16,
+ "nb_procs": 2,
+ "nb_threads": 32,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
+ },
+ "bmc_version": "2.86.86.86",
+ "chassis": {
+ "manufactured_at": "2016-03-28",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "16P9WC2",
+ "warranty_end": "2019-03-28"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 68719476736
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_a1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "ixgbe",
+ "enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "ip": "172.16.26.10",
+ "ip6": "2001:660:4406:100:b::a",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:97:4c",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-2.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/9",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:97:4e",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.10",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:97:50",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-2-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 41600000000,
+ "node_flops": 665600000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 20971520,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "microcode": "0x49",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v3"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025032008",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x5000c5008e7fd4cf",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "IS06",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "ST1200MM0007",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Seagate"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "chartreuse3-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
new file mode 100644
index 00000000000..8b76e10af76
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -0,0 +1,168 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 16,
+ "nb_procs": 2,
+ "nb_threads": 32,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
+ },
+ "bmc_version": "2.86.86.86",
+ "chassis": {
+ "manufactured_at": "2016-03-28",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "16NGWC2",
+ "warranty_end": "2019-03-28"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 68719476736
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_a1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "ixgbe",
+ "enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "ip": "172.16.26.11",
+ "ip6": "2001:660:4406:100:b::b",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:7c:ac",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-3.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/10",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:7c:ae",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.11",
+ "kavlan": false,
+ "mac": "00:8c:fa:fd:7c:b0",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-3-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 41600000000,
+ "node_flops": 665600000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 20971520,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "microcode": "0x49",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v3"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025032008",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x5000c5008e72e577",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "IS06",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "ST1200MM0007",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Seagate"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "chartreuse3-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
new file mode 100644
index 00000000000..efaf6dcb46d
--- /dev/null
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -0,0 +1,168 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 16,
+ "nb_procs": 2,
+ "nb_threads": 32,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/21/2024",
+ "vendor": "Dell Inc.",
+ "version": "2.19.0"
+ },
+ "bmc_version": "2.86.86.86",
+ "chassis": {
+ "manufactured_at": "2016-03-28",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6320",
+ "serial": "16PFWC2",
+ "warranty_end": "2019-03-28"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 68719476736
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_a1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 17179869184,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 17179869184,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "ixgbe",
+ "enabled": true,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "ip": "172.16.26.12",
+ "ip6": "2001:660:4406:100:b::c",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:9b:06",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "chartreuse3-4.grenoble.grid5000.fr",
+ "rate": 10000000000,
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/11",
+ "vendor": "Intel"
+ },
+ {
+ "device": "eth1",
+ "driver": "ixgbe",
+ "enabled": false,
+ "firmware_version": "0x8000095e, 18.5.18",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:9b:08",
+ "management": false,
+ "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2",
+ "sriov": true,
+ "sriov_totalvfs": 63,
+ "vendor": "Intel"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.26.12",
+ "kavlan": false,
+ "mac": "00:8c:fa:fe:9b:0a",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "chartreuse3-4-bmc.grenoble.grid5000.fr"
+ }
+ ],
+ "nodeset": "chartreuse3",
+ "operating_system": {
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "intel_cpufreq",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 41600000000,
+ "node_flops": 665600000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 262144,
+ "cache_l3": 20971520,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Haswell",
+ "microcode": "0x49",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) CPU E5-2640 v3 @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "E5-2640 v3"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025032008",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x5000c5008e80589b",
+ "by_path": "/dev/disk/by-path/pci-0000:02:00.0-sas-phy0-lun-0",
+ "firmware_version": "IS06",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "ST1200MM0007",
+ "size": 1200243695616,
+ "storage": "HDD",
+ "vendor": "Seagate"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "chartreuse3-4"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
index e32ea649167..d91b74c95a9 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.yaml
@@ -8,7 +8,7 @@ chartreuse3-1:
nb_threads: 32
platform_type: x86_64
bios:
- release_date: 03/18/2024
+ release_date: 02/21/2024
vendor: Dell Inc.
version: 2.19.0
bmc_version: 2.86.86.86
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
index fb47055af7d..afaba11400d 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.yaml
@@ -8,7 +8,7 @@ chartreuse3-2:
nb_threads: 32
platform_type: x86_64
bios:
- release_date: 03/18/2024
+ release_date: 02/21/2024
vendor: Dell Inc.
version: 2.19.0
bmc_version: 2.86.86.86
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
index 79157b3e65a..f1b6ecfb0f6 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.yaml
@@ -8,7 +8,7 @@ chartreuse3-3:
nb_threads: 32
platform_type: x86_64
bios:
- release_date: 03/18/2024
+ release_date: 02/21/2024
vendor: Dell Inc.
version: 2.19.0
bmc_version: 2.86.86.86
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
index 5ba60c8cd81..a1f3751f867 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.yaml
@@ -8,7 +8,7 @@ chartreuse3-4:
nb_threads: 32
platform_type: x86_64
bios:
- release_date: 03/18/2024
+ release_date: 02/21/2024
vendor: Dell Inc.
version: 2.19.0
bmc_version: 2.86.86.86
--
GitLab
From 88e88e26332230869fe849eedbf5bec053ff1ce1 Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Mon, 31 Mar 2025 10:40:47 +0200
Subject: [PATCH 41/47] [esterel6] import IB informations
---
.../sophia/clusters/esterel6/nodes/esterel6-1.json | 8 +++-----
.../sophia/clusters/esterel6/nodes/esterel6-1.yaml | 11 +++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index c79c894f8c8..1c243df81b7 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -11,7 +11,7 @@
"vendor": "Dell Inc.",
"version": "2.18.2"
},
- "bmc_version": "2.85.85.85",
+ "bmc_version": "unknown",
"chassis": {
"manufactured_at": "2017-04-18",
"manufacturer": "Dell Inc.",
@@ -164,7 +164,7 @@
},
{
"device": "ib0",
- "driver": "ib_ipoib",
+ "driver": "mlx4_core",
"enabled": true,
"firmware_version": "2.40.5000",
"guid": "0x248a070300ffd1c1",
@@ -176,12 +176,10 @@
"model": "MT27500 Family [ConnectX-3]",
"mountable": true,
"mounted": true,
- "name": "ibp130s0",
+ "name": "ib0",
"netmask": "255.255.240.0",
"network_address": "esterel6-1-ib0.sophia.grid5000.fr",
"rate": 40000000000,
- "sriov": false,
- "sriov_totalvfs": 0,
"vendor": "Mellanox Technologies"
},
{
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
index cebecacb0b8..50dd885ac8b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
@@ -11,7 +11,7 @@ esterel6-1:
release_date: 10/18/2023
vendor: Dell Inc.
version: 2.18.2
- bmc_version: 2.85.85.85
+ bmc_version: unknown
chassis:
manufacturer: Dell Inc.
name: PowerEdge T630
@@ -94,17 +94,16 @@ esterel6-1:
sriov_totalvfs: 0
vendor: Intel
ib0:
- driver: ib_ipoib
+ driver: mlx4_core
firmware_version: 2.40.5000
guid: '0x248a070300ffd1c1'
interface: InfiniBand
- mac: 80:00:02:08:fe:80:00:00:00:00:00:00:24:8a:07:03:00:ff:d1:c1
+ ip: 172.18.131.7
+ mac: 24:8a:07:03:00:ff:d1:c1
management: false
model: MT27500 Family [ConnectX-3]
- name: ibp130s0
+ name: ib0
rate: 40000000000
- sriov: false
- sriov_totalvfs: 0
vendor: Mellanox Technologies
operating_system:
cstate_driver: intel_idle
--
GitLab
From ba2e9fe673d2ca4c4cb0a6d75016c4ed47aba01f Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Mon, 31 Mar 2025 10:47:53 +0200
Subject: [PATCH 42/47] [esterel6] Fix MAC@ IB
---
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index 1c243df81b7..8164c495239 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -171,7 +171,7 @@
"interface": "InfiniBand",
"ip": "172.18.131.7",
"kavlan": false,
- "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:24:8a:07:03:00:ff:d1:c1",
+ "mac": "24:8a:07:03:00:ff:d1:c1",
"management": false,
"model": "MT27500 Family [ConnectX-3]",
"mountable": true,
--
GitLab
From efd0307601d28c7cb2d686a967e8495589686e19 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 31 Mar 2025 10:51:06 +0200
Subject: [PATCH 43/47] [Grenoble][Chartreuse3] Add kavlan configuration
---
.../clusters/chartreuse3/chartreuse3.json | 2 +-
.../chartreuse3/nodes/chartreuse3-1.json | 46 ++++++++++++++++++-
.../chartreuse3/nodes/chartreuse3-2.json | 46 ++++++++++++++++++-
.../chartreuse3/nodes/chartreuse3-3.json | 46 ++++++++++++++++++-
.../chartreuse3/nodes/chartreuse3-4.json | 46 ++++++++++++++++++-
.../clusters/chartreuse3/chartreuse3.yaml | 2 +-
6 files changed, 182 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
index 1c81cf91723..1face6434c4 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.json
@@ -2,7 +2,7 @@
"boot_type": "bios",
"created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
"exotic": false,
- "kavlan": false,
+ "kavlan": true,
"manufactured_at": "2016-03-28",
"metrics": [
{
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index 89515f13314..d36a2a1782d 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -20,6 +20,50 @@
"warranty_end": "2019-03-28"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.9",
+ "kavlan-11": "10.7.247.9",
+ "kavlan-12": "10.11.247.9",
+ "kavlan-13": "10.15.247.9",
+ "kavlan-14": "10.19.247.9",
+ "kavlan-16": "10.27.247.9",
+ "kavlan-17": "10.31.247.9",
+ "kavlan-18": "10.35.247.9",
+ "kavlan-2": "192.168.214.9",
+ "kavlan-20": "10.43.247.9",
+ "kavlan-21": "10.47.247.9",
+ "kavlan-3": "192.168.230.9",
+ "kavlan-4": "10.4.7.9",
+ "kavlan-5": "10.4.71.9",
+ "kavlan-6": "10.4.135.9",
+ "kavlan-7": "10.4.199.9",
+ "kavlan-8": "10.5.7.9",
+ "kavlan-9": "10.5.71.9"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::9",
+ "kavlan-11": "2001:660:4406:1a0:10b::9",
+ "kavlan-12": "2001:660:4406:2a0:10b::9",
+ "kavlan-13": "2001:660:4406:4a0:10b::9",
+ "kavlan-14": "2001:660:4406:5a0:10b::9",
+ "kavlan-16": "2001:660:4406:7a0:10b::9",
+ "kavlan-17": "2001:660:4406:9a0:10b::9",
+ "kavlan-18": "2001:660:4406:8a0:10b::9",
+ "kavlan-2": "2001:660:4406:181:b::9",
+ "kavlan-20": "2001:660:4406:3a0:10b::9",
+ "kavlan-21": "2001:660:4406:6a0:10b::9",
+ "kavlan-3": "2001:660:4406:182:b::9",
+ "kavlan-4": "2001:660:4406:190:b::9",
+ "kavlan-5": "2001:660:4406:191:b::9",
+ "kavlan-6": "2001:660:4406:192:b::9",
+ "kavlan-7": "2001:660:4406:193:b::9",
+ "kavlan-8": "2001:660:4406:194:b::9",
+ "kavlan-9": "2001:660:4406:195:b::9"
+ }
+ },
"main_memory": {
"ram_size": 68719476736
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.9",
"ip6": "2001:660:4406:100:b::9",
- "kavlan": false,
+ "kavlan": true,
"mac": "00:8c:fa:fd:6f:b6",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index e4e7de88b80..2e3eff7caac 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -20,6 +20,50 @@
"warranty_end": "2019-03-28"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.10",
+ "kavlan-11": "10.7.247.10",
+ "kavlan-12": "10.11.247.10",
+ "kavlan-13": "10.15.247.10",
+ "kavlan-14": "10.19.247.10",
+ "kavlan-16": "10.27.247.10",
+ "kavlan-17": "10.31.247.10",
+ "kavlan-18": "10.35.247.10",
+ "kavlan-2": "192.168.214.10",
+ "kavlan-20": "10.43.247.10",
+ "kavlan-21": "10.47.247.10",
+ "kavlan-3": "192.168.230.10",
+ "kavlan-4": "10.4.7.10",
+ "kavlan-5": "10.4.71.10",
+ "kavlan-6": "10.4.135.10",
+ "kavlan-7": "10.4.199.10",
+ "kavlan-8": "10.5.7.10",
+ "kavlan-9": "10.5.71.10"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::a",
+ "kavlan-11": "2001:660:4406:1a0:10b::a",
+ "kavlan-12": "2001:660:4406:2a0:10b::a",
+ "kavlan-13": "2001:660:4406:4a0:10b::a",
+ "kavlan-14": "2001:660:4406:5a0:10b::a",
+ "kavlan-16": "2001:660:4406:7a0:10b::a",
+ "kavlan-17": "2001:660:4406:9a0:10b::a",
+ "kavlan-18": "2001:660:4406:8a0:10b::a",
+ "kavlan-2": "2001:660:4406:181:b::a",
+ "kavlan-20": "2001:660:4406:3a0:10b::a",
+ "kavlan-21": "2001:660:4406:6a0:10b::a",
+ "kavlan-3": "2001:660:4406:182:b::a",
+ "kavlan-4": "2001:660:4406:190:b::a",
+ "kavlan-5": "2001:660:4406:191:b::a",
+ "kavlan-6": "2001:660:4406:192:b::a",
+ "kavlan-7": "2001:660:4406:193:b::a",
+ "kavlan-8": "2001:660:4406:194:b::a",
+ "kavlan-9": "2001:660:4406:195:b::a"
+ }
+ },
"main_memory": {
"ram_size": 68719476736
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.10",
"ip6": "2001:660:4406:100:b::a",
- "kavlan": false,
+ "kavlan": true,
"mac": "00:8c:fa:fe:97:4c",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index 8b76e10af76..1c15072503a 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -20,6 +20,50 @@
"warranty_end": "2019-03-28"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.11",
+ "kavlan-11": "10.7.247.11",
+ "kavlan-12": "10.11.247.11",
+ "kavlan-13": "10.15.247.11",
+ "kavlan-14": "10.19.247.11",
+ "kavlan-16": "10.27.247.11",
+ "kavlan-17": "10.31.247.11",
+ "kavlan-18": "10.35.247.11",
+ "kavlan-2": "192.168.214.11",
+ "kavlan-20": "10.43.247.11",
+ "kavlan-21": "10.47.247.11",
+ "kavlan-3": "192.168.230.11",
+ "kavlan-4": "10.4.7.11",
+ "kavlan-5": "10.4.71.11",
+ "kavlan-6": "10.4.135.11",
+ "kavlan-7": "10.4.199.11",
+ "kavlan-8": "10.5.7.11",
+ "kavlan-9": "10.5.71.11"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::b",
+ "kavlan-11": "2001:660:4406:1a0:10b::b",
+ "kavlan-12": "2001:660:4406:2a0:10b::b",
+ "kavlan-13": "2001:660:4406:4a0:10b::b",
+ "kavlan-14": "2001:660:4406:5a0:10b::b",
+ "kavlan-16": "2001:660:4406:7a0:10b::b",
+ "kavlan-17": "2001:660:4406:9a0:10b::b",
+ "kavlan-18": "2001:660:4406:8a0:10b::b",
+ "kavlan-2": "2001:660:4406:181:b::b",
+ "kavlan-20": "2001:660:4406:3a0:10b::b",
+ "kavlan-21": "2001:660:4406:6a0:10b::b",
+ "kavlan-3": "2001:660:4406:182:b::b",
+ "kavlan-4": "2001:660:4406:190:b::b",
+ "kavlan-5": "2001:660:4406:191:b::b",
+ "kavlan-6": "2001:660:4406:192:b::b",
+ "kavlan-7": "2001:660:4406:193:b::b",
+ "kavlan-8": "2001:660:4406:194:b::b",
+ "kavlan-9": "2001:660:4406:195:b::b"
+ }
+ },
"main_memory": {
"ram_size": 68719476736
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.11",
"ip6": "2001:660:4406:100:b::b",
- "kavlan": false,
+ "kavlan": true,
"mac": "00:8c:fa:fd:7c:ac",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index efaf6dcb46d..c82fb405864 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -20,6 +20,50 @@
"warranty_end": "2019-03-28"
},
"exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.198.12",
+ "kavlan-11": "10.7.247.12",
+ "kavlan-12": "10.11.247.12",
+ "kavlan-13": "10.15.247.12",
+ "kavlan-14": "10.19.247.12",
+ "kavlan-16": "10.27.247.12",
+ "kavlan-17": "10.31.247.12",
+ "kavlan-18": "10.35.247.12",
+ "kavlan-2": "192.168.214.12",
+ "kavlan-20": "10.43.247.12",
+ "kavlan-21": "10.47.247.12",
+ "kavlan-3": "192.168.230.12",
+ "kavlan-4": "10.4.7.12",
+ "kavlan-5": "10.4.71.12",
+ "kavlan-6": "10.4.135.12",
+ "kavlan-7": "10.4.199.12",
+ "kavlan-8": "10.5.7.12",
+ "kavlan-9": "10.5.71.12"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:180:b::c",
+ "kavlan-11": "2001:660:4406:1a0:10b::c",
+ "kavlan-12": "2001:660:4406:2a0:10b::c",
+ "kavlan-13": "2001:660:4406:4a0:10b::c",
+ "kavlan-14": "2001:660:4406:5a0:10b::c",
+ "kavlan-16": "2001:660:4406:7a0:10b::c",
+ "kavlan-17": "2001:660:4406:9a0:10b::c",
+ "kavlan-18": "2001:660:4406:8a0:10b::c",
+ "kavlan-2": "2001:660:4406:181:b::c",
+ "kavlan-20": "2001:660:4406:3a0:10b::c",
+ "kavlan-21": "2001:660:4406:6a0:10b::c",
+ "kavlan-3": "2001:660:4406:182:b::c",
+ "kavlan-4": "2001:660:4406:190:b::c",
+ "kavlan-5": "2001:660:4406:191:b::c",
+ "kavlan-6": "2001:660:4406:192:b::c",
+ "kavlan-7": "2001:660:4406:193:b::c",
+ "kavlan-8": "2001:660:4406:194:b::c",
+ "kavlan-9": "2001:660:4406:195:b::c"
+ }
+ },
"main_memory": {
"ram_size": 68719476736
},
@@ -60,7 +104,7 @@
"interface": "Ethernet",
"ip": "172.16.26.12",
"ip6": "2001:660:4406:100:b::c",
- "kavlan": false,
+ "kavlan": true,
"mac": "00:8c:fa:fe:9b:06",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
index d826a5eff0f..2a998153e86 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse3/chartreuse3.yaml
@@ -1,7 +1,7 @@
---
model: Dell PowerEdge C6320
created_at: 2025-03-20
-kavlan: false
+kavlan: true
boot_type: bios
exotic: false
queues:
--
GitLab
From 7fa0335ea6cb8ae3bac3782fd50341aa3ebddf4a Mon Sep 17 00:00:00 2001
From: Julien Lelaurain <julien.lelaurain@inria.fr>
Date: Fri, 28 Mar 2025 14:19:06 +0100
Subject: [PATCH 44/47] [sophia][esterel32] add esterel32 cluster
---
.../sophia/clusters/esterel32/esterel32.json | 66 ++++
.../clusters/esterel32/nodes/esterel32-1.json | 326 ++++++++++++++++++
.../sites/sophia/network_equipments/sw-2.json | 4 +
.../sophia/network_equipments/swadmin-2.json | 3 +
input/grid5000/dell-product-data.yaml | 6 +
input/grid5000/ipv4.yaml | 1 +
.../sophia/clusters/esterel32/esterel32.yaml | 53 +++
.../clusters/esterel32/esterel32_metrics.yaml | 40 +++
.../clusters/esterel32/nodes/esterel32-1.yaml | 180 ++++++++++
.../grid5000/sites/sophia/networks/sw-2.yaml | 2 +
.../sites/sophia/networks/swadmin-2.yaml | 3 +
lib/refrepo/input_loader.rb | 2 +-
lib/refrepo/net_names_mapping.yaml | 6 +
13 files changed, 691 insertions(+), 1 deletion(-)
create mode 100644 data/grid5000/sites/sophia/clusters/esterel32/esterel32.json
create mode 100644 data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json
create mode 100644 input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml
diff --git a/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json b/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json
new file mode 100644
index 00000000000..a30d4954ac5
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel32/esterel32.json
@@ -0,0 +1,66 @@
+{
+ "boot_type": "bios",
+ "created_at": "Thu, 20 Mar 2025 00:00:00 GMT",
+ "exotic": false,
+ "kavlan": false,
+ "manufactured_at": "2020-08-09",
+ "metrics": [
+ {
+ "description": "Default subset of metrics from Prometheus Node Exporter",
+ "name": "prom_default_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "id": [
+ "node_boot_time_seconds",
+ "node_cpu_scaling_frequency_hertz",
+ "node_cpu_seconds_total",
+ "node_filesystem_free_bytes",
+ "node_filesystem_size_bytes",
+ "node_load1",
+ "node_load15",
+ "node_load5",
+ "node_memory_Buffers_bytes",
+ "node_memory_Cached_bytes",
+ "node_memory_MemAvailable_bytes",
+ "node_memory_MemFree_bytes",
+ "node_memory_MemTotal_bytes",
+ "node_memory_Shmem_bytes",
+ "node_memory_SwapFree_bytes",
+ "node_memory_SwapTotal_bytes",
+ "node_network_receive_bytes_total",
+ "node_network_receive_packets_total",
+ "node_network_transmit_bytes_total",
+ "node_network_transmit_packets_total",
+ "node_procs_blocked",
+ "node_procs_running",
+ "kwollect_custom"
+ ],
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ },
+ {
+ "description": "All metrics from Prometheus Node Exporter",
+ "name": "prom_all_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ }
+ ],
+ "model": "Dell PowerEdge T640",
+ "nodes_count": 1,
+ "nodes_description": "2 CPUs Intel Xeon Gold 6238R, 28 cores/CPU, 4 GPUs Quadro RTX 8000, 768GB RAM, 446GB HDD, 7151GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+ "priority": 202108,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "redfish": true,
+ "type": "cluster",
+ "uid": "esterel32",
+ "warranty_end": "2027-08-10"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json b/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json
new file mode 100644
index 00000000000..2e3025d439e
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.json
@@ -0,0 +1,326 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 56,
+ "nb_procs": 2,
+ "nb_threads": 112,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/09/2025",
+ "vendor": "Dell Inc.",
+ "version": "2.23.0"
+ },
+ "bmc_version": "7.00.00.174",
+ "chassis": {
+ "manufactured_at": "2020-08-09",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge T640",
+ "serial": "5XXGW53",
+ "warranty_end": "2027-08-10"
+ },
+ "exotic": false,
+ "gpu_devices": {
+ "nvidia0": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia0",
+ "memory": 48318382080,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 8000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia1": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 0,
+ "device": "/dev/nvidia1",
+ "memory": 48318382080,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 8000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia2": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia2",
+ "memory": 48318382080,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 8000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.03",
+ "vendor": "Nvidia"
+ },
+ "nvidia3": {
+ "compute_capability": "7.5",
+ "cores": 4608,
+ "cpu_affinity": 1,
+ "device": "/dev/nvidia3",
+ "memory": 48318382080,
+ "microarchitecture": "Turing",
+ "model": "Quadro RTX 8000",
+ "performance": {
+ "fp-16": 32620000000000,
+ "fp-32": 16310000000000,
+ "fp-64": 510000000000
+ },
+ "power_default_limit": "250.00 W",
+ "vbios_version": "90.02.4E.00.03",
+ "vendor": "Nvidia"
+ }
+ },
+ "main_memory": {
+ "ram_size": 824633720832
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_a1",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a3",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 68719476736,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 68719476736,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "bnxt_en",
+ "enabled": true,
+ "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+ "interface": "Ethernet",
+ "ip": "172.16.131.45",
+ "ip6": "2001:660:4406:800:4::2d",
+ "kavlan": false,
+ "mac": "f4:02:70:ed:2a:74",
+ "management": false,
+ "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "esterel32-1.sophia.grid5000.fr",
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "sw-2",
+ "switch_port": "1/1/18",
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth1",
+ "driver": "bnxt_en",
+ "enabled": false,
+ "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "f4:02:70:ed:2a:75",
+ "management": false,
+ "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+ "mountable": false,
+ "mounted": false,
+ "name": "eno2np1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth2",
+ "driver": "mlx4_en",
+ "enabled": false,
+ "firmware_version": "2.9.1000",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "00:02:c9:4f:f9:15",
+ "management": false,
+ "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+ "mountable": false,
+ "mounted": false,
+ "name": "enp137s0d1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Mellanox Technologies"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.9.1000",
+ "guid": "0x0002c903004ff915",
+ "interface": "InfiniBand",
+ "ip": "172.18.131.45",
+ "kavlan": false,
+ "mac": "00:02:c9:03:00:4f:f9:15",
+ "management": false,
+ "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "esterel32-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.131.45",
+ "kavlan": false,
+ "mac": "f4:02:70:ed:2a:84",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "esterel32-1-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "esterel32",
+ "operating_system": {
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
+ "ht_enabled": true,
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 70400000000,
+ "node_flops": 3942400000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 1048576,
+ "cache_l3": 40370176,
+ "clock_speed": 2200000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Cascade Lake-SP",
+ "microcode": "0x5003801",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6238R CPU @ 2.20GHz",
+ "vendor": "Intel",
+ "version": "Gold 6238R"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025032008",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x62cea7f0578207002f76eb1f130760be",
+ "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
+ "id": "disk0",
+ "interface": "RAID",
+ "model": "PERC H730P Adp",
+ "size": 479559942144,
+ "storage": "HDD",
+ "vendor": "Dell"
+ },
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x62cea7f05782070027de23a04219a934",
+ "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
+ "id": "disk1",
+ "interface": "RAID",
+ "model": "PERC H730P Adp",
+ "size": 7678864654336,
+ "storage": "HDD",
+ "vendor": "Dell"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "esterel32-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 1cee59a69d0..463d63f8c53 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -79,6 +79,10 @@
"uid": "esterel26-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/18",
+ "uid": "esterel32-1"
},
{
},
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
index f15945ad4d8..99360916c89 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -66,6 +66,9 @@
"uid": "esterel26-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/12",
+ "uid": "esterel32-1-bmc"
},
{
},
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 852d67134b5..1eb3f12701d 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2274,6 +2274,12 @@ sites:
chassis:
manufactured_at: 2016-06-08
warranty_end: 2021-06-08
+ esterel32:
+ nodes:
+ esterel32-1:
+ chassis:
+ manufactured_at: 2020-08-09
+ warranty_end: 2027-08-10
esterel5:
nodes:
esterel5-1:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index b7c367fa29f..ae3ebedd09f 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -197,6 +197,7 @@ ipv4:
sophia esterel30 eth0 0 0 3 36
sophia esterel31 eth0 0 0 3 40
sophia esterel32 eth0 0 0 3 44
+ sophia esterel32 ib0 0 0 3 44
sophia esterel33 eth0 0 0 3 45
sophia esterel34 eth0 0 0 3 46
sophia esterel35 eth0 0 0 3 47
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml b/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml
new file mode 100644
index 00000000000..7a8f378e837
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/esterel32.yaml
@@ -0,0 +1,53 @@
+---
+model: Dell PowerEdge T640
+created_at: 2025-03-20
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+ - admin
+ - testing
+nodes:
+ esterel32-1:
+ supported_job_types:
+ deploy: true
+ besteffort: true
+ max_walltime: 0
+ processor:
+ microarchitecture: Cascade Lake-SP
+ clock_speed: 2200000000
+ network_adapters:
+ bmc:
+ interface: Ethernet
+ enabled: true
+ mountable: false
+ mounted: false
+ eth0:
+ enabled: true
+ mountable: true
+ mounted: true
+ eth1:
+ enabled: false
+ mountable: false
+ mounted: false
+ eth2:
+ enabled: false
+ mountable: false
+ mounted: false
+ ib0:
+ mounted: true
+ enabled: true
+ mountable: true
+ netmask: 255.255.240.0
+ storage_devices:
+ pci-0000:19:00.0-scsi-0:2:0:0:
+ id: disk0
+ interface: RAID
+ pci-0000:19:00.0-scsi-0:2:1:0:
+ id: disk1
+ interface: RAID
+ software:
+ standard-environment: debian11-x64-std
+ management_tools:
+ bmc_vendor_tool: racadm
+ nodeset: esterel32
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml
new file mode 100644
index 00000000000..729e9beb582
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/esterel32_metrics.yaml
@@ -0,0 +1,40 @@
+---
+metrics:
+ - name: prom_default_metrics
+ description: Default subset of metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
+ id:
+ - node_boot_time_seconds
+ - node_cpu_scaling_frequency_hertz
+ - node_cpu_seconds_total
+ - node_filesystem_free_bytes
+ - node_filesystem_size_bytes
+ - node_load1
+ - node_load15
+ - node_load5
+ - node_memory_Buffers_bytes
+ - node_memory_Cached_bytes
+ - node_memory_MemAvailable_bytes
+ - node_memory_MemFree_bytes
+ - node_memory_MemTotal_bytes
+ - node_memory_Shmem_bytes
+ - node_memory_SwapFree_bytes
+ - node_memory_SwapTotal_bytes
+ - node_network_receive_bytes_total
+ - node_network_receive_packets_total
+ - node_network_transmit_bytes_total
+ - node_network_transmit_packets_total
+ - node_procs_blocked
+ - node_procs_running
+ - kwollect_custom
+ - name: prom_all_metrics
+ description: All metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml b/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml
new file mode 100644
index 00000000000..b40c53d7f8d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel32/nodes/esterel32-1.yaml
@@ -0,0 +1,180 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel32-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 56
+ nb_procs: 2
+ nb_threads: 112
+ platform_type: x86_64
+ bios:
+ release_date: 01/09/2025
+ vendor: Dell Inc.
+ version: 2.23.0
+ bmc_version: 7.00.00.174
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge T640
+ serial: 5XXGW53
+ gpu_devices:
+ nvidia0:
+ cpu_affinity: 0
+ device: "/dev/nvidia0"
+ memory: 48318382080
+ model: Quadro RTX 8000
+ power_default_limit: 250.00 W
+ vbios_version: 90.02.4E.00.03
+ vendor: Nvidia
+ nvidia1:
+ cpu_affinity: 0
+ device: "/dev/nvidia1"
+ memory: 48318382080
+ model: Quadro RTX 8000
+ power_default_limit: 250.00 W
+ vbios_version: 90.02.4E.00.03
+ vendor: Nvidia
+ nvidia2:
+ cpu_affinity: 1
+ device: "/dev/nvidia2"
+ memory: 48318382080
+ model: Quadro RTX 8000
+ power_default_limit: 250.00 W
+ vbios_version: 90.02.4E.00.03
+ vendor: Nvidia
+ nvidia3:
+ cpu_affinity: 1
+ device: "/dev/nvidia3"
+ memory: 48318382080
+ model: Quadro RTX 8000
+ power_default_limit: 250.00 W
+ vbios_version: 90.02.4E.00.03
+ vendor: Nvidia
+ main_memory:
+ ram_size: 824633720832
+ memory_devices:
+ dimm_a1:
+ size: 68719476736
+ technology: dram
+ dimm_a2:
+ size: 68719476736
+ technology: dram
+ dimm_a3:
+ size: 68719476736
+ technology: dram
+ dimm_a4:
+ size: 68719476736
+ technology: dram
+ dimm_a5:
+ size: 68719476736
+ technology: dram
+ dimm_a6:
+ size: 68719476736
+ technology: dram
+ dimm_b1:
+ size: 68719476736
+ technology: dram
+ dimm_b2:
+ size: 68719476736
+ technology: dram
+ dimm_b3:
+ size: 68719476736
+ technology: dram
+ dimm_b4:
+ size: 68719476736
+ technology: dram
+ dimm_b5:
+ size: 68719476736
+ technology: dram
+ dimm_b6:
+ size: 68719476736
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.131.45
+ mac: f4:02:70:ed:2a:84
+ management: true
+ eth0:
+ driver: bnxt_en
+ firmware_version: 218.0.219.13/pkg 21.85.21.92
+ interface: Ethernet
+ ip: 172.16.131.45
+ mac: f4:02:70:ed:2a:74
+ management: false
+ model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth1:
+ driver: bnxt_en
+ firmware_version: 218.0.219.13/pkg 21.85.21.92
+ interface: Ethernet
+ mac: f4:02:70:ed:2a:75
+ management: false
+ model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+ name: eno2np1
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth2:
+ driver: mlx4_en
+ firmware_version: 2.9.1000
+ interface: Ethernet
+ mac: 00:02:c9:4f:f9:15
+ management: false
+ model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+ IC with PCIe 2.0 x8 5.0GT/s Interface
+ name: enp137s0d1
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Mellanox Technologies
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.9.1000
+ guid: '0x0002c903004ff915'
+ interface: InfiniBand
+ ip: 172.18.131.45
+ mac: 00:02:c9:03:00:4f:f9:15
+ management: false
+ model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+ IC with PCIe 2.0 x8 5.0GT/s Interface
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 1048576
+ cache_l3: 40370176
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x5003801'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6238R CPU @ 2.20GHz
+ vendor: Intel
+ version: Gold 6238R
+ storage_devices:
+ pci-0000:19:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x62cea7f0578207002f76eb1f130760be"
+ by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H730P Adp
+ size: 479559942144
+ storage: HDD
+ pci-0000:19:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x62cea7f05782070027de23a04219a934"
+ by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H730P Adp
+ size: 7678864654336
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index ca5d943dae4..baf2898fccc 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -46,6 +46,8 @@ sw-2:
kind: other
17:
uid: esterel26-1
+ 18:
+ uid: esterel32-1
33:
uid: esterel10-2
port: eth1
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
index e6b52ec4453..5bc03730674 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-2.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -47,6 +47,9 @@ swadmin-2:
11:
uid: esterel26-1-bmc
kind: other
+ 12:
+ uid: esterel32-1-bmc
+ kind: other
25:
uid: sw-2
kind: switch
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index df08b5111e2..00e5e9149a3 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
case cpu_name
when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
return 16
- when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
+ when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6238R/
return 32
end
raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index af7c985a69d..526c6e90592 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -445,6 +445,12 @@ esterel27:
enp129s0f1: eth1
enp1s0f0np0: eth0
ibp28s0: ib0
+esterel32:
+ enp1s0f0np0: eth0
+ eno1np0: eth0
+ eno2np1: eth1
+ enp137s0d1: eth2
+ ibp137s0: ib0
esterel41:
enp1s0f0np0: eth0
ens15f1: eth1
--
GitLab
From 987352e7fc9071a03e4409f5b125faac8f928f40 Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Mon, 31 Mar 2025 13:44:46 +0200
Subject: [PATCH 45/47] [esterel6] Fix bmc version
---
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.json | 2 +-
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index 8164c495239..daeaf6de944 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -11,7 +11,7 @@
"vendor": "Dell Inc.",
"version": "2.18.2"
},
- "bmc_version": "unknown",
+ "bmc_version": "2.85.85.85",
"chassis": {
"manufactured_at": "2017-04-18",
"manufacturer": "Dell Inc.",
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
index 50dd885ac8b..0c30192c0a5 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
@@ -11,7 +11,7 @@ esterel6-1:
release_date: 10/18/2023
vendor: Dell Inc.
version: 2.18.2
- bmc_version: unknown
+ bmc_version: 2.85.85.85
chassis:
manufacturer: Dell Inc.
name: PowerEdge T630
--
GitLab
From 0f6978d9217da3b295eb4f6d08b7f95cc066481b Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Mon, 31 Mar 2025 14:12:08 +0200
Subject: [PATCH 46/47] [gen/wiki] rename production queue to abaca
---
lib/refrepo/gen/wiki/generators/site_hardware.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index d66cf5b3936..72f3f19e3fe 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -62,7 +62,7 @@ class SiteHardwareGenerator < WikiGenerator
output = ''
[
[ '== Default queue resources ==', /(^$|exotic)/ ],
- [ '== Production queue resources ==', /production/],
+ [ '== Abaca queue resources ==', /production/],
[ '== Testing queue resources ==', /testing/]
].each do |title,regexp|
if table_data.select{ |row| row[column] =~ regexp}.length > 0
@@ -115,7 +115,7 @@ class SiteHardwareGenerator < WikiGenerator
summary += MW::TABLE_CELL + ' width="50%" valign="top" ' + MW::TABLE_CELL + MW::LINE_FEED
## 2st inner table
summary += MW::TABLE_START + ' width="100%"' + MW::LINE_FEED
- summary += print_header_summary('=== Production queue resources ===', 'production', store)
+ summary += print_header_summary('=== Abaca queue resources ===', 'production', store)
summary += MW::TABLE_END + MW::LINE_FEED
## End outer-tablie
@@ -194,7 +194,7 @@ class SiteHardwareGenerator < WikiGenerator
queue = cluster_hash.map { |_k, v| v['queue']}.first
access_conditions = []
if queue == 'production'
- access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|#{queue}]]</b> queue"
+ access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|abaca]]</b> queue"
elsif queue != ''
access_conditions << "<b>#{queue}</b> queue"
end
@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator
reservation_cmd = "\n{{Term|location=f#{site}|cmd="
reservation_cmd += "<code class=\"command\">oarsub</code> "
- reservation_cmd += "<code class=\"replace\">-q #{queue}</code> "
+ reservation_cmd += "<code class=\"replace\">-q #{queue == 'production' ? 'abaca' : queue}</code> "
reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first
reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> "
reservation_cmd += "<code>-I</code>"
--
GitLab
From f215f39947180cee593b155bbdea728832413254 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Mon, 31 Mar 2025 15:14:57 +0200
Subject: [PATCH 47/47] [gen/wiki] rename the rest of the production queue to
abaca...
---
lib/refrepo/gen/wiki/generators/site_hardware.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 72f3f19e3fe..1666cc84e54 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -249,9 +249,9 @@ class SiteHardwareGenerator < WikiGenerator
queue = (queue.nil? || queue.empty?) ? 'default' : queue
queue_drawgantt_url = get_queue_drawgantt_url(site, queue)
if (queue != 'testing')
- text_data << "\n= Clusters in the [#{queue_drawgantt_url} #{queue} queue] ="
+ text_data << "\n= Clusters in the [#{queue_drawgantt_url} #{queue == 'production' ? 'abaca' : queue} queue] ="
else
- text_data << "\n= Clusters in the #{queue} queue ="
+ text_data << "\n= Clusters in the #{queue == 'production' ? 'abaca' : queue} queue ="
end
clusters.sort_by{|cluster_uid, _cluster_hash| split_cluster_node(cluster_uid) }.to_h.each { |cluster_uid, cluster_hash|
subclusters = cluster_hash.keys.count != 1
--
GitLab