diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json index ee543c4fc5ec1ffb971046209dd29e2156293bc1..9701a8cced60506c0c788c4e0c4268979e9c3ea8 100644 --- a/data/grid5000/accesses/refrepo.json +++ b/data/grid5000/accesses/refrepo.json @@ -11878,6 +11878,139 @@ ], "uid": "drac" }, + "nessie": { + "created_at": "Fri, 08 Nov 2024 00:00:00 GMT", + "manufactured_at": "2024-08-19", + "model": "HPE ProLiant DL385 Gen10+ v2", + "nodes": { + "nessie-1": { + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 64, + "nb_procs": 2, + "nb_threads": 128, + "platform_type": "x86_64" + }, + "memory_devices": [ + { + "device": "dimm_proc 1 dimm 3", + "size": 34359738368, + "technology": "dram" + }, + { + "device": "dimm_proc 2 dimm 3", + "size": 34359738368, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "bnxt_en", + "enabled": true, + "firmware_version": "228.0.116.0/pkg 228.1.111.0", + "interface": "Ethernet", + "ip": "172.16.25.1", + "ip6": "2001:660:4406:100:a::1", + "kavlan": false, + "mac": "d4:04:e6:06:7d:66", + "management": false, + "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller", + "mountable": true, + "mounted": true, + "name": "eth0", + "network_address": "nessie-1.grenoble.grid5000.fr", + "rate": 25000000000, + "sriov": false, + "sriov_totalvfs": 0, + "switch": "imag-1b-F3-prod-01", + "switch_port": "1/1/22", + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "eth1", + "driver": "bnxt_en", + "enabled": false, + "firmware_version": "228.0.116.0/pkg 228.1.111.0", + "interface": "Ethernet", + "kavlan": false, + "mac": "d4:04:e6:06:7d:67", + "management": false, + "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller", + "mountable": false, + "mounted": false, + "name": "eth1", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.25.1", + "kavlan": false, + "mac": "5c:ed:8c:f5:1c:c8", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "nessie-1-bmc.grenoble.grid5000.fr" + } + ], + "nodeset": "nessie", + "performance": { + "core_flops": 108800000000, + "node_flops": 6963200000000 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 49152, + "cache_l1i": 32768, + "cache_l2": 2097152, + "cache_l3": 62914560, + "clock_speed": 3400000000, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Golden Cove", + "microcode": "0x2b0005d2", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) Gold 6430", + "vendor": "Intel", + "version": "nil" + }, + "storage_devices": [ + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:1:0", + "firmware_version": "HPK5", + "id": "disk0", + "interface": "NVME", + "model": "VO001920KYDMT", + "size": 1920383410176, + "storage": "SSD", + "vendor": "HP" + }, + { + "by_id": "/dev/disk/by-id/wwn-0x5ace42e3a5001512", + "by_path": "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:2:0", + "firmware_version": "HPG3", + "id": "disk1", + "interface": "SATA", + "model": "VK000480GZCNE", + "size": 480103981056, + "storage": "SSD", + "vendor": "HP" + } + ], + "uid": "nessie-1" + } + }, + "queues": [ + "admin", + "testing" + ], + "uid": "nessie" + }, "servan": { "created_at": "Wed, 15 Dec 2021 00:00:00 GMT", "manufactured_at": "2021-12-10", diff --git a/data/grid5000/sites/grenoble/clusters/nessie/nessie.json b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json new file mode 100644 index 0000000000000000000000000000000000000000..b8783b7e4d58fed3ab18e5b6b219aafd0403e7da --- /dev/null +++ b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json @@ -0,0 +1,19 @@ +{ + "boot_type": "uefi", + "created_at": "Fri, 08 Nov 2024 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "manufactured_at": "2024-08-19", + "metrics": [ + + ], + "model": "HPE ProLiant DL385 Gen10+ v2", + "queues": [ + "admin", + "testing" + ], + "redfish": true, + "type": "cluster", + "uid": "nessie", + "warranty_end": "2031-08-19" +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.json b/data/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.json new file mode 100644 index 0000000000000000000000000000000000000000..59e3943cb755bd457cb5153050ac7219dee61f0b --- /dev/null +++ b/data/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.json @@ -0,0 +1,169 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 64, + "nb_procs": 2, + "nb_threads": 128, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "06/19/2024", + "vendor": "HPE", + "version": 2.22 + }, + "bmc_version": "1.58", + "chassis": { + "manufactured_at": "2024-08-19", + "manufacturer": "HPE", + "name": "ProLiant DL380 Gen11", + "serial": "CZ243200MS", + "warranty_end": "2031-08-19" + }, + "exotic": false, + "main_memory": { + "ram_size": 68719476736 + }, + "management_tools": { + "bmc_vendor_tool": "ipmitool", + "ipmitool": { + "retries": 5 + } + }, + "memory_devices": [ + { + "device": "dimm_proc 1 dimm 3", + "size": 34359738368, + "technology": "dram" + }, + { + "device": "dimm_proc 2 dimm 3", + "size": 34359738368, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "bnxt_en", + "enabled": true, + "firmware_version": "228.0.116.0/pkg 228.1.111.0", + "interface": "Ethernet", + "ip": "172.16.25.1", + "ip6": "2001:660:4406:100:a::1", + "kavlan": false, + "mac": "d4:04:e6:06:7d:66", + "management": false, + "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller", + "mountable": true, + "mounted": true, + "name": "eth0", + "network_address": "nessie-1.grenoble.grid5000.fr", + "rate": 25000000000, + "sriov": false, + "sriov_totalvfs": 0, + "switch": "imag-1b-F3-prod-01", + "switch_port": "1/1/22", + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "eth1", + "driver": "bnxt_en", + "enabled": false, + "firmware_version": "228.0.116.0/pkg 228.1.111.0", + "interface": "Ethernet", + "kavlan": false, + "mac": "d4:04:e6:06:7d:67", + "management": false, + "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller", + "mountable": false, + "mounted": false, + "name": "eth1", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.25.1", + "kavlan": false, + "mac": "5c:ed:8c:f5:1c:c8", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "nessie-1-bmc.grenoble.grid5000.fr" + } + ], + "nodeset": "nessie", + "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": 6963200000000 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 49152, + "cache_l1i": 32768, + "cache_l2": 2097152, + "cache_l3": 62914560, + "clock_speed": 3400000000, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Golden Cove", + "microcode": "0x2b0005d2", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) Gold 6430", + "vendor": "Intel", + "version": "nil" + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2024112508", + "standard-environment": "debian11-x64-std" + }, + "storage_devices": [ + { + "by_id": "", + "by_path": "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:1:0", + "firmware_version": "HPK5", + "id": "disk0", + "interface": "NVME", + "model": "VO001920KYDMT", + "size": 1920383410176, + "storage": "SSD", + "vendor": "HP" + }, + { + "by_id": "/dev/disk/by-id/wwn-0x5ace42e3a5001512", + "by_path": "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:2:0", + "firmware_version": "HPG3", + "id": "disk1", + "interface": "SATA", + "model": "VK000480GZCNE", + "size": 480103981056, + "storage": "SSD", + "vendor": "HP" + } + ], + "supported_job_types": { + "besteffort": true, + "deploy": true, + "max_walltime": 0, + "queues": [ + "admin", + "testing" + ], + "virtual": "ivt" + }, + "type": "node", + "uid": "nessie-1" +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json index 0de896d893a45e4a6665776f6dd7eceeeb671a41..6b43cccc3d4d45c4ff57a0202f8a9442c578b97f 100644 --- a/data/grid5000/sites/grenoble/network_equipments/gw.json +++ b/data/grid5000/sites/grenoble/network_equipments/gw.json @@ -28,6 +28,12 @@ "port": "port-channel30", "rate": 20000000000, "uid": "orichard-nixbuild" + }, + "port-channel50": { + "kind": "switch", + "port": "lag1", + "rate": 50000000000, + "uid": "imag-1b-F3-prod-01" } }, "ip": "172.16.31.254", @@ -365,8 +371,16 @@ { }, { + "kind": "channel", + "rate": 25000000000, + "snmp_name": "ethernet1/1/67:1", + "uid": "port-channel50" }, { + "kind": "channel", + "rate": 25000000000, + "snmp_name": "ethernet1/1/68:1", + "uid": "port-channel50" }, { }, diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json new file mode 100644 index 0000000000000000000000000000000000000000..61ed1f3c45fab53ec55d7f5b383f767c2d7683d9 --- /dev/null +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json @@ -0,0 +1,139 @@ +{ + "backplane_bps": 4800000000000, + "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}", + "ip": "172.17.31.250", + "kind": "switch", + "linecards": [ + { + }, + { + "backplane_bps": 4800000000000, + "kavlan_pattern": "%LINECARD%/1/%PORT%", + "ports": [ + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "rate": 10000000000, + "snmp_name": "1/1/33", + "trunk": false, + "uid": "imag-1b-F1-admin" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "snmp_name": "1/1/49", + "uid": "imag-1b-F3-prod-01" + }, + { + "kind": "switch", + "snmp_name": "1/1/50", + "uid": "imag-1b-F2-prod-01" + } + ], + "rate": 25000000000, + "snmp_pattern": "%LINECARD%/1/%PORT%" + } + ], + "managed_by_us": true, + "model": "Aruba JL719C 8360-48Y6C v2 Switch", + "serial": "SG46L5L0BP", + "site": "grenoble", + "snmp_community": "public", + "type": "network_equipment", + "uid": "imag-1b-F1-prod-01", + "warranty": "2048-05" +} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json new file mode 100644 index 0000000000000000000000000000000000000000..e276a2485e24ddb97ef003e7a870057cfcaf7971 --- /dev/null +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json @@ -0,0 +1,139 @@ +{ + "backplane_bps": 4800000000000, + "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}", + "ip": "172.17.31.251", + "kind": "switch", + "linecards": [ + { + }, + { + "backplane_bps": 4800000000000, + "kavlan_pattern": "%LINECARD%/1/%PORT%", + "ports": [ + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "rate": 10000000000, + "snmp_name": "1/1/33", + "trunk": false, + "uid": "imag-1b-F2-admin" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "snmp_name": "1/1/49", + "uid": "imag-1b-F1-prod-01" + }, + { + "kind": "switch", + "snmp_name": "1/1/50", + "uid": "imag-1b-F3-prod-01" + } + ], + "rate": 25000000000, + "snmp_pattern": "%LINECARD%/1/%PORT%" + } + ], + "managed_by_us": true, + "model": "Aruba JL719C 8360-48Y6C v2 Switch", + "serial": "SG46L5L0BQ", + "site": "grenoble", + "snmp_community": "public", + "type": "network_equipment", + "uid": "imag-1b-F2-prod-01", + "warranty": "2048-05" +} \ No newline at end of file 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 new file mode 100644 index 0000000000000000000000000000000000000000..61fed4e07c85fc70dd034a0a7ac2b3eaa7fbad03 --- /dev/null +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json @@ -0,0 +1,187 @@ +{ + "backplane_bps": 4800000000000, + "channels": { + "lag1": { + "kind": "router", + "port": "lag1", + "rate": 50000000000, + "ssh_name": "lag 1", + "uid": "gw" + } + }, + "channels_ssh_pattern": "#{/\\D+/.match(\"%CHANNEL%\")} #{/\\d+/.match(\"%CHANNEL%\")}", + "ip": "172.17.31.252", + "kind": "switch", + "linecards": [ + { + }, + { + "backplane_bps": 4800000000000, + "kavlan_pattern": "%LINECARD%/1/%PORT%", + "kind": "node", + "ports": [ + { + }, + { + "kind": "channel", + "snmp_name": "1/1/1", + "uid": "lag1" + }, + { + "kind": "channel", + "snmp_name": "1/1/2", + "uid": "lag1" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "server", + "snmp_name": "1/1/14", + "uid": "pve-1" + }, + { + "kind": "server", + "snmp_name": "1/1/15", + "uid": "pve-2" + }, + { + "kind": "server", + "snmp_name": "1/1/16", + "uid": "nfs-1" + }, + { + "kind": "server", + "snmp_name": "1/1/17", + "uid": "group-storage-1" + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/22", + "uid": "nessie-1" + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + }, + { + "kind": "switch", + "rate": 10000000000, + "snmp_name": "1/1/44", + "trunk": false, + "uid": "imag-1b-F3-admin" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/45", + "uid": "chartreuse1-1" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/46", + "uid": "chartreuse1-2" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/47", + "uid": "chartreuse1-3" + }, + { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/48", + "uid": "chartreuse1-4" + }, + { + "kind": "switch", + "snmp_name": "1/1/49", + "uid": "imag-1b-F1-prod-01" + }, + { + "kind": "switch", + "snmp_name": "1/1/50", + "uid": "imag-1b-F2-prod-01" + } + ], + "rate": 25000000000, + "snmp_pattern": "%LINECARD%/1/%PORT%" + } + ], + "managed_by_us": true, + "model": "Aruba JL719C 8360-48Y6C v2 Switch", + "serial": "SG46L5L09G", + "site": "grenoble", + "snmp_community": "public", + "type": "network_equipment", + "uid": "imag-1b-F3-prod-01", + "warranty": "2048-05" +} \ No newline at end of file diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml index 9ef0a6abccf7ccc7051499ab18e1f50ca005039f..d2cfe2c9c44118f53785c1e81339fc3963ce1555 100644 --- a/input/grid5000/disks.yaml +++ b/input/grid5000/disks.yaml @@ -91,6 +91,7 @@ disk_vendor_model_mapping: - VK000960GXAWL - VK000960GXNZB - VK003840GWSRV + - VK000480GZCNE Micron: - MTFDDAK480TDN - MTFDDAK960TDD @@ -135,6 +136,8 @@ disk_vendor_model_mapping: - Dell Express Flash PM1725b 1.6TB AIC - Dell Ent NVMe AGN MU AIC 1.6TB - Dell Ent NVMe v2 AGN MU U.2 1.6TB + HP: + - VO001920KYDMT Samsung: - SAMSUNG MZ1LB1T9HALS-00007 - Samsung SSD 970 EVO Plus 2TB diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index f8e8fad55056848346ef28aebfed88fb63219184..cf3d1ea18ee471a80cdd5a3900463450d4eb089a 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -20,6 +20,7 @@ ipv4: grenoble servan fpga0 0 0 7 10 grenoble servan fpga1 0 0 7 20 grenoble drac eth0 0 0 8 0 + grenoble nessie eth0 0 0 9 0 lille chifflot eth0 0 0 4 0 lille chifflot eth1 0 0 4 100 lille chiclet eth0 0 0 7 0 diff --git a/input/grid5000/sites/grenoble/clusters/nessie/nessie.yaml b/input/grid5000/sites/grenoble/clusters/nessie/nessie.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3fbe0c0911ea7ace1e6f6c59c70466b3d9ea9c63 --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/nessie/nessie.yaml @@ -0,0 +1,48 @@ +--- +model: HPE ProLiant DL385 Gen10+ v2 +created_at: 2024-11-08 +kavlan: false +boot_type: uefi +exotic: false +queues: + - admin + - testing +nodes: + nessie-1: + chassis: + manufactured_at: 2024-08-19 + warranty_end: 2031-08-19 + supported_job_types: + deploy: true + besteffort: true + max_walltime: 0 + processor: + microarchitecture: Golden Cove + clock_speed: 3_400_000_000 + version: nil # TODO fix this broken version + network_adapters: + bmc: + enabled: true + mountable: false + mounted: false + interface: Ethernet + eth0: + enabled: true + mountable: true + mounted: true + eth1: + enabled: false + mountable: false + mounted: false + storage_devices: + pci-0000:36:00.0-scsi-0:2:1:0: + id: disk0 + interface: NVME + pci-0000:36:00.0-scsi-0:2:2:0: + id: disk1 + interface: SATA + software: + standard-environment: debian11-x64-std + management_tools: + bmc_vendor_tool: ipmitool + nodeset: nessie diff --git a/input/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.yaml b/input/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cb355aa97367af0f417f21afcf0331a18948e6d5 --- /dev/null +++ b/input/grid5000/sites/grenoble/clusters/nessie/nodes/nessie-1.yaml @@ -0,0 +1,90 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +nessie-1: + architecture: + cpu_core_numbering: contiguous + nb_cores: 64 + nb_procs: 2 + nb_threads: 128 + platform_type: x86_64 + bios: + release_date: 06/19/2024 + vendor: HPE + version: 2.22 + bmc_version: '1.58' + chassis: + manufacturer: HPE + name: ProLiant DL380 Gen11 + serial: CZ243200MS + main_memory: + ram_size: 68719476736 + memory_devices: + dimm_proc 1 dimm 3: + size: 34359738368 + technology: dram + dimm_proc 2 dimm 3: + size: 34359738368 + technology: dram + network_adapters: + bmc: + ip: 172.17.25.1 + mac: 5c:ed:8c:f5:1c:c8 + management: true + eth0: + driver: bnxt_en + firmware_version: 228.0.116.0/pkg 228.1.111.0 + interface: Ethernet + ip: 172.16.25.1 + mac: d4:04:e6:06:7d:66 + management: false + model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller + name: eth0 + rate: 25000000000 + sriov: false + sriov_totalvfs: 0 + vendor: Broadcom Inc. and subsidiaries + eth1: + driver: bnxt_en + firmware_version: 228.0.116.0/pkg 228.1.111.0 + interface: Ethernet + mac: d4:04:e6:06:7d:67 + management: false + model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller + name: eth1 + 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: 2097152 + cache_l3: 62914560 + ht_capable: true + instruction_set: x86-64 + microcode: '0x2b0005d2' + model: Intel Xeon + other_description: Intel(R) Xeon(R) Gold 6430 + vendor: Intel + storage_devices: + pci-0000:36:00.0-scsi-0:2:1:0: + by_path: "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:1:0" + firmware_version: HPK5 + model: VO001920KYDMT + size: 1920383410176 + storage: SSD + pci-0000:36:00.0-scsi-0:2:2:0: + by_id: "/dev/disk/by-id/wwn-0x5ace42e3a5001512" + by_path: "/dev/disk/by-path/pci-0000:36:00.0-scsi-0:2:2:0" + firmware_version: HPG3 + model: VK000480GZCNE + size: 480103981056 + storage: SSD + supported_job_types: + virtual: ivt diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml index b2fe681159052a6ed41ef1f622183fe94552ef43..7920d2bfa783691576ee20d52fa9b5f055f3423d 100644 --- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml +++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml @@ -168,6 +168,14 @@ gw: 46: drac-10 47: drac-11 48: drac-12 + 67: + uid: port-channel50 + kind: channel + rate: 25_000_000_000 + 68: + uid: port-channel50 + kind: channel + rate: 25_000_000_000 75: uid: port-channel30 kind: channel @@ -279,6 +287,11 @@ gw: port: port-channel20 kind: server rate: 20000000000 + port-channel50: + uid: imag-1b-F3-prod-01 + port: lag1 + kind: switch + rate: 50_000_000_000 port-channel30: uid: orichard-nixbuild port: port-channel30 diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ddb422180c8cb3f65c3c11b7ce053cca647edc80 --- /dev/null +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml @@ -0,0 +1,31 @@ +--- +imag-1b-F1-prod-01: + model: Aruba JL719C 8360-48Y6C v2 Switch + warranty: 2048-05 + serial: SG46L5L0BP + kind: switch + managed_by_us: true + site: grenoble + snmp_community: public + ip: 172.17.31.250 + backplane_bps: 4_800_000_000_000 + linecards: + 1: + snmp_pattern: "%LINECARD%/1/%PORT%" + kavlan_pattern: "%LINECARD%/1/%PORT%" + rate: 25_000_000_000 + backplane_bps: 4_800_000_000_000 + ports: + 33: + uid: imag-1b-F1-admin + kind: switch + rate: 10_000_000_000 + trunk: false + 49: + uid: imag-1b-F3-prod-01 + kind: switch + 50: + uid: imag-1b-F2-prod-01 + kind: switch + channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}' + diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1ad54014c0714c50021064007c828315af8999d7 --- /dev/null +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml @@ -0,0 +1,31 @@ +--- +imag-1b-F2-prod-01: + model: Aruba JL719C 8360-48Y6C v2 Switch + warranty: 2048-05 + serial: SG46L5L0BQ + kind: switch + managed_by_us: true + site: grenoble + snmp_community: public + ip: 172.17.31.251 + backplane_bps: 4_800_000_000_000 + linecards: + 1: + snmp_pattern: "%LINECARD%/1/%PORT%" + kavlan_pattern: "%LINECARD%/1/%PORT%" + rate: 25_000_000_000 + backplane_bps: 4_800_000_000_000 + ports: + 33: + uid: imag-1b-F2-admin + kind: switch + rate: 10_000_000_000 + trunk: false + 49: + uid: imag-1b-F1-prod-01 + kind: switch + 50: + uid: imag-1b-F3-prod-01 + kind: switch + channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}' + 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 new file mode 100644 index 0000000000000000000000000000000000000000..e372ea86c72f2792d3db4801d7769d7a70933a40 --- /dev/null +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml @@ -0,0 +1,65 @@ +--- +imag-1b-F3-prod-01: + model: Aruba JL719C 8360-48Y6C v2 Switch + warranty: 2048-05 + serial: SG46L5L09G + kind: switch + managed_by_us: true + site: grenoble + snmp_community: public + ip: 172.17.31.252 + backplane_bps: 4_800_000_000_000 + linecards: + 1: + snmp_pattern: "%LINECARD%/1/%PORT%" + kavlan_pattern: "%LINECARD%/1/%PORT%" + rate: 25_000_000_000 + backplane_bps: 4_800_000_000_000 + kind: node + ports: + 1: + uid: lag1 + kind: channel + 2: + uid: lag1 + kind: channel + 14: + uid: pve-1 + kind: server + 15: + uid: pve-2 + kind: server + 16: + uid: nfs-1 + kind: server + 17: + uid: group-storage-1 + kind: server + 22: + uid: nessie-1 + 44: + uid: imag-1b-F3-admin + kind: switch + rate: 10_000_000_000 + trunk: false + 45: + uid: chartreuse1-1 + 46: + uid: chartreuse1-2 + 47: + uid: chartreuse1-3 + 48: + uid: chartreuse1-4 + 49: + uid: imag-1b-F1-prod-01 + kind: switch + 50: + uid: imag-1b-F2-prod-01 + kind: switch + channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}' + channels: + lag1: + kind: router + rate: 50_000_000_000 + uid: gw + port: lag1 diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml index fc5a1d51bcf7b523ecdc09039640316d8e739eea..1ed92a6bc9d126f6225bb7fda4ea602e7931b80b 100644 --- a/input/grid5000/sites/grenoble/servers/physical.yaml +++ b/input/grid5000/sites/grenoble/servers/physical.yaml @@ -72,3 +72,4 @@ dignfs: name: storage1 size: 55000000000000 rate: 50000000000 + diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb index c841dd882b25466ee4128d704bcfb9bc692f09f9..a80c33ead4779b8274f57b1a8bcd14e90dd39240 100644 --- a/lib/refrepo/input_loader.rb +++ b/lib/refrepo/input_loader.rb @@ -730,6 +730,8 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid) # FIXME: Find Jetson's FlopPerCycle when /Carmel/ return 8 + when "Golden Cove" + return 32 end raise "Error: Unknown CPU architecture for cluster #{cluster_uid}, cannot compute flops" end diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index 4c6e6fa102801af671841a4c40cb7fd7f13fc981..d715e23b61c5cbc291b5d5967ed306b5d634f213 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -201,6 +201,9 @@ hercule: montcalm: ens10f0np0: eth0 ens10f1np1: eth1 +nessie: + enp53s0f0np0: eth0 + enp53s0f1np1: eth1 nova: eno1: eth2 eno2: eth3 diff --git a/lib/refrepo/valid/network.rb b/lib/refrepo/valid/network.rb index e845e24f60a0971466692d38d44555cbc18b1a44..9737143269dcfa24d1720f3f337097edb3481d98 100644 --- a/lib/refrepo/valid/network.rb +++ b/lib/refrepo/valid/network.rb @@ -330,6 +330,7 @@ def generate_dot(netnodes, links, site) "2x10G" => 0.8, "4x10G" => 1.5, "25G" => 1, + "2x25G" => 1.5, "40G" => 1.5, "2x40G" => 2.0, "100G" => 2.5,