From 0ec76bef7069ba866cb114192c116141a761d0be Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Fri, 1 Sep 2023 13:38:44 +0200
Subject: [PATCH] [toulouse] Add montcalm-10
---
.../clusters/montcalm/nodes/montcalm-10.json | 228 ++++++++++++++++++
.../network_equipments/gw-toulouse.json | 3 +-
.../sites/toulouse/servers/montcalm-10.json | 18 --
.../toulouse/clusters/montcalm/montcalm.yaml | 2 +-
.../clusters/montcalm/nodes/montcalm-10.yaml | 103 ++++++++
.../sites/toulouse/networks/gw-toulouse.yaml | 4 +-
.../sites/toulouse/servers/physical.yaml | 10 -
7 files changed, 335 insertions(+), 33 deletions(-)
create mode 100644 data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.json
delete mode 100644 data/grid5000/sites/toulouse/servers/montcalm-10.json
create mode 100644 input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.yaml
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.json
new file mode 100644
index 0000000000..a44f4440c2
--- /dev/null
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.json
@@ -0,0 +1,228 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 32,
+ "nb_procs": 2,
+ "nb_threads": 64,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "02/02/2023",
+ "vendor": "HPE",
+ "version": "U46"
+ },
+ "bmc_version": "2.81",
+ "chassis": {
+ "manufacturer": "HPE",
+ "name": "ProLiant DL360 Gen10 Plus",
+ "serial": "CZJ244064Z"
+ },
+ "exotic": false,
+ "kavlan": {
+ "eth0": {
+ "kavlan-1": "192.168.192.10",
+ "kavlan-11": "10.7.242.10",
+ "kavlan-12": "10.11.242.10",
+ "kavlan-13": "10.15.242.10",
+ "kavlan-14": "10.19.242.10",
+ "kavlan-16": "10.27.242.10",
+ "kavlan-17": "10.31.242.10",
+ "kavlan-18": "10.35.242.10",
+ "kavlan-2": "192.168.208.10",
+ "kavlan-20": "10.43.242.10",
+ "kavlan-21": "10.47.242.10",
+ "kavlan-3": "192.168.224.10",
+ "kavlan-4": "10.28.0.10",
+ "kavlan-5": "10.28.64.10",
+ "kavlan-6": "10.28.128.10",
+ "kavlan-7": "10.28.192.10",
+ "kavlan-8": "10.29.0.10",
+ "kavlan-9": "10.29.64.10"
+ }
+ },
+ "kavlan6": {
+ "eth0": {
+ "kavlan-1": "2001:660:4406:980:9::a",
+ "kavlan-11": "2001:660:4406:1a0:909::a",
+ "kavlan-12": "2001:660:4406:2a0:909::a",
+ "kavlan-13": "2001:660:4406:4a0:909::a",
+ "kavlan-14": "2001:660:4406:5a0:909::a",
+ "kavlan-16": "2001:660:4406:7a0:909::a",
+ "kavlan-17": "2001:660:4406:9a0:909::a",
+ "kavlan-18": "2001:660:4406:8a0:909::a",
+ "kavlan-2": "2001:660:4406:981:9::a",
+ "kavlan-20": "2001:660:4406:3a0:909::a",
+ "kavlan-21": "2001:660:4406:6a0:909::a",
+ "kavlan-3": "2001:660:4406:982:9::a",
+ "kavlan-4": "2001:660:4406:990:9::a",
+ "kavlan-5": "2001:660:4406:991:9::a",
+ "kavlan-6": "2001:660:4406:992:9::a",
+ "kavlan-7": "2001:660:4406:993:9::a",
+ "kavlan-8": "2001:660:4406:994:9::a",
+ "kavlan-9": "2001:660:4406:995:9::a"
+ }
+ },
+ "main_memory": {
+ "ram_size": 274877906944
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "ipmitool",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 10",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 14",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 1 dimm 7",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 10",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 14",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_proc 2 dimm 7",
+ "size": 34359738368,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "bnxt_en",
+ "enabled": true,
+ "firmware_version": "218.0.152.0/pkg 218.0.166.0",
+ "interface": "Ethernet",
+ "ip": "172.16.120.10",
+ "ip6": "2001:660:4406:900:9::1",
+ "kavlan": true,
+ "mac": "84:16:0c:4b:3d:c4",
+ "management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+ "mountable": true,
+ "mounted": true,
+ "name": "ens10f0np0",
+ "network_address": "montcalm-10.toulouse.grid5000.fr",
+ "rate": 10000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "switch": "gw-toulouse",
+ "switch_port": "1/1/10",
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "eth1",
+ "driver": "bnxt_en",
+ "enabled": false,
+ "firmware_version": "218.0.152.0/pkg 218.0.166.0",
+ "interface": "Ethernet",
+ "kavlan": false,
+ "mac": "84:16:0c:4b:3d:c5",
+ "management": false,
+ "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
+ "mountable": false,
+ "mounted": false,
+ "name": "ens10f1np1",
+ "sriov": false,
+ "sriov_totalvfs": 0,
+ "vendor": "Broadcom Inc. and subsidiaries"
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.120.1",
+ "kavlan": false,
+ "mac": "5c:ed:8c:3b:14:92",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "montcalm-10-bmc.toulouse.grid5000.fr"
+ }
+ ],
+ "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": 108800000000,
+ "node_flops": 3481600000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 49152,
+ "cache_l1i": 32768,
+ "cache_l2": 1310720,
+ "cache_l3": 25165824,
+ "clock_speed": 3400000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Ice Lake",
+ "microcode": "0xd000389",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz",
+ "vendor": "Intel",
+ "version": "Silver 4314"
+ },
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2023090110",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "/dev/disk/by-id/wwn-0x500a07513b97103f",
+ "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
+ "firmware_version": "HPG1",
+ "id": "disk0",
+ "interface": "SATA",
+ "model": "VK000960GXAWL",
+ "size": 960197124096,
+ "storage": "SSD",
+ "vendor": "HP"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "virtual": "ivt"
+ },
+ "type": "node",
+ "uid": "montcalm-10"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 835c72a6d6..f84c259d32 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -83,7 +83,8 @@
"uid": "montcalm-9"
},
{
- "kind": "server",
+ "kind": "node",
+ "port": "eth0",
"snmp_name": "1/1/10",
"uid": "montcalm-10"
},
diff --git a/data/grid5000/sites/toulouse/servers/montcalm-10.json b/data/grid5000/sites/toulouse/servers/montcalm-10.json
deleted file mode 100644
index 315e38016f..0000000000
--- a/data/grid5000/sites/toulouse/servers/montcalm-10.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "alias": [
- "montcalm-x"
- ],
- "kind": "physical",
- "network_adapters": {
- "bmc": {
- "ip": "172.17.120.10",
- "mac": "5c:ed:8c:3b:14:92"
- },
- "default": {
- "ip": "172.16.120.10",
- "mac": "84:16:0c:4b:3d:c4"
- }
- },
- "type": "server",
- "uid": "montcalm-10"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
index 8a518fd46a..c0ddfb4352 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
@@ -7,7 +7,7 @@ queues:
- admin
- testing
nodes:
- montcalm-[1-9]:
+ montcalm-[1-10]:
supported_job_types:
deploy: true
besteffort: true
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.yaml
new file mode 100644
index 0000000000..603e0bd1c9
--- /dev/null
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-10.yaml
@@ -0,0 +1,103 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+montcalm-10:
+ architecture:
+ cpu_core_numbering: contiguous
+ nb_cores: 32
+ nb_procs: 2
+ nb_threads: 64
+ platform_type: x86_64
+ bios:
+ release_date: 02/02/2023
+ vendor: HPE
+ version: U46
+ bmc_version: '2.81'
+ chassis:
+ manufacturer: HPE
+ name: ProLiant DL360 Gen10 Plus
+ serial: CZJ244064Z
+ main_memory:
+ ram_size: 274877906944
+ memory_devices:
+ dimm_proc 1 dimm 10:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 14:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 3:
+ size: 34359738368
+ technology: dram
+ dimm_proc 1 dimm 7:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 10:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 14:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 3:
+ size: 34359738368
+ technology: dram
+ dimm_proc 2 dimm 7:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.120.1
+ mac: 5c:ed:8c:3b:14:92
+ management: true
+ eth0:
+ driver: bnxt_en
+ firmware_version: 218.0.152.0/pkg 218.0.166.0
+ interface: Ethernet
+ ip: 172.16.120.1
+ mac: 84:16:0c:4b:3d:c4
+ management: false
+ model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+ name: ens10f0np0
+ rate: 10000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ eth1:
+ driver: bnxt_en
+ firmware_version: 218.0.152.0/pkg 218.0.166.0
+ interface: Ethernet
+ mac: 84:16:0c:4b:3d:c5
+ management: false
+ model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+ name: ens10f1np1
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Broadcom Inc. and subsidiaries
+ 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: 49152
+ cache_l1i: 32768
+ cache_l2: 1310720
+ cache_l3: 25165824
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0xd000389'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz
+ vendor: Intel
+ version: Silver 4314
+ storage_devices:
+ pci-0000:00:17.0-ata-1:
+ by_id: "/dev/disk/by-id/wwn-0x500a07513b97103f"
+ by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
+ firmware_version: HPG1
+ model: VK000960GXAWL
+ size: 960197124096
+ storage: SSD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
index 008d02960a..dfbed6aae7 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -77,9 +77,7 @@ gw-toulouse:
7: montcalm-7
8: montcalm-8
9: montcalm-9
- 10:
- uid: montcalm-10
- kind: server
+ 10: montcalm-10
15:
uid: port-channel2
kind: channel
diff --git a/input/grid5000/sites/toulouse/servers/physical.yaml b/input/grid5000/sites/toulouse/servers/physical.yaml
index 4425e76c46..df9b54cba4 100644
--- a/input/grid5000/sites/toulouse/servers/physical.yaml
+++ b/input/grid5000/sites/toulouse/servers/physical.yaml
@@ -47,13 +47,3 @@ oobm:
default:
ip: 172.17.121.1
mac: 00:30:64:37:c8:c8
-montcalm-10:
- kind: physical
- alias: [montcalm-x]
- network_adapters:
- default:
- ip: 172.16.120.10
- mac: 84:16:0c:4b:3d:c4
- bmc:
- ip: 172.17.120.10
- mac: 5c:ed:8c:3b:14:92
--
GitLab