diff --git a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json new file mode 100644 index 0000000000000000000000000000000000000000..cf3bfa537322386f79d909e454e016d6d847c18d --- /dev/null +++ b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json @@ -0,0 +1,445 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 128, + "nb_procs": 2, + "nb_threads": 256, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "02/08/2021", + "vendor": "American Megatrends Inc.", + "version": 0.34 + }, + "bmc_version": "0.14", + "chassis": { + "manufacturer": "NVIDIA", + "name": "DGXA100 920-23687-2530-000", + "serial": 1572221610085 + }, + "exotic": false, + "main_memory": { + "ram_size": 1099511627776 + }, + "management_tools": { + "bmc_vendor_tool": "ipmitool", + "ipmitool": { + "retries": 5 + } + }, + "memory_devices": [ + { + "device": "dimm_cpu0_dimm_a1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_b1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_c1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_d1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_e1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_f1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_g1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu0_dimm_h1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_i1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_j1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_k1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_l1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_m1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_n1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_o1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + }, + { + "device": "dimm_cpu1_dimm_p1", + "firmware": "Unknown", + "size": 68719476736, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "igb", + "enabled": true, + "firmware_version": "3.25, 0x800005cc", + "interface": "Ethernet", + "ip": "172.16.56.1", + "ip6": "2001:660:4406:400:9::1", + "kavlan": false, + "mac": "5c:ff:35:e3:84:29", + "management": false, + "model": "I210 Gigabit Network Connection", + "mountable": true, + "mounted": true, + "name": "eth0", + "network_address": "sirius-1.lyon.grid5000.fr", + "rate": 1000000000, + "sriov": false, + "sriov_totalvfs": 0, + "switch": null, + "switch_port": null, + "vendor": "Intel" + }, + { + "device": "eth1", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000 (MT_0000000225)", + "interface": "Ethernet", + "kavlan": false, + "mac": "b8:ce:f6:2d:18:d6", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "eth1", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Mellanox Technologies" + }, + { + "device": "eth2", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000 (MT_0000000225)", + "interface": "Ethernet", + "kavlan": false, + "mac": "b8:ce:f6:2d:18:d7", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "eth2", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib0", + "driver": "mlx5_core", + "enabled": true, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300632c5c", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:2c:5c", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": true, + "mounted": true, + "name": "ib0", + "network_address": "sirius-1-ib0.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib1", + "driver": "mlx5_core", + "enabled": true, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300632c54", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:2c:54", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": true, + "mounted": false, + "name": "ib1", + "network_address": "sirius-1-ib1.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib2", + "driver": "mlx5_core", + "enabled": true, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300632388", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:23:88", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": true, + "mounted": false, + "name": "ib2", + "network_address": "sirius-1-ib2.lyon.grid5000.fr", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib3", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000", + "guid": "0xb8cef603007d8592", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:7d:85:92", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "ib3", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib4", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300633c8c", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:3c:8c", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "ib4", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib5", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300633c94", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:3c:94", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "ib5", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib6", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000", + "guid": "0xb8cef60300632310", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:63:23:10", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "ib6", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "ib7", + "driver": "mlx5_core", + "enabled": false, + "firmware_version": "20.28.4000", + "guid": "0xb8cef603007d8002", + "interface": "InfiniBand", + "kavlan": false, + "mac": "b8:ce:f6:03:00:7d:80:02", + "management": false, + "model": "MT28908 Family [ConnectX-6]", + "mountable": false, + "mounted": false, + "name": "ib7", + "rate": 10000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.56.1", + "kavlan": false, + "mac": "5c:ff:35:e3:84:be", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "sirius-1-bmc.lyon.grid5000.fr" + } + ], + "operating_system": { + "cstate_driver": "none", + "cstate_governor": "menu", + "ht_enabled": true, + "pstate_driver": "acpi-cpufreq", + "pstate_governor": "performance", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 33600000000, + "node_flops": 4300800000000 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 524288, + "cache_l3": 16777216, + "clock_speed": 2100000000, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Zen 2", + "microcode": "0x8301034", + "model": "AMD EPYC", + "other_description": "AMD EPYC 7742 64-Core Processor", + "vendor": "AMD", + "version": 7742 + }, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2021120100", + "standard-environment": "debian11-x64-std" + }, + "storage_devices": [ + { + "by_id": "/dev/disk/by-id/nvme-eui.34333630522580960025384100000001", + "by_path": "/dev/disk/by-path/pci-0000:22:00.0-nvme-1", + "id": "disk0", + "interface": "NVME", + "model": "SAMSUNG MZ1LB1T9HALS-00007", + "size": 1920383410176, + "storage": "SSD", + "vendor": "Samsung" + }, + { + "by_id": "/dev/disk/by-id/nvme-eui.34333630522580930025384100000001", + "by_path": "/dev/disk/by-path/pci-0000:23:00.0-nvme-1", + "id": "disk1", + "interface": "NVME", + "model": "SAMSUNG MZ1LB1T9HALS-00007", + "size": 1920383410176, + "storage": "SSD", + "vendor": "Samsung" + }, + { + "by_id": "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485ce01", + "by_path": "/dev/disk/by-path/pci-0000:09:00.0-nvme-1", + "id": "disk2", + "interface": "NVME", + "model": "KCM6DRUL3T84", + "size": 3840755982336, + "storage": "SSD", + "vendor": "Kioxia" + }, + { + "by_id": "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20486ae01", + "by_path": "/dev/disk/by-path/pci-0000:52:00.0-nvme-1", + "id": "disk3", + "interface": "NVME", + "model": "KCM6DRUL3T84", + "size": 3840755982336, + "storage": "SSD", + "vendor": "Kioxia" + }, + { + "by_id": "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485da01", + "by_path": "/dev/disk/by-path/pci-0000:ca:00.0-nvme-1", + "id": "disk4", + "interface": "NVME", + "model": "KCM6DRUL3T84", + "size": 3840755982336, + "storage": "SSD", + "vendor": "Kioxia" + }, + { + "by_id": "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485e901", + "by_path": "/dev/disk/by-path/pci-0000:8a:00.0-nvme-1", + "id": "disk5", + "interface": "NVME", + "model": "KCM6DRUL3T84", + "size": 3840755982336, + "storage": "SSD", + "vendor": "Kioxia" + } + ], + "supported_job_types": { + "besteffort": true, + "deploy": true, + "max_walltime": 0, + "queues": [ + "admin", + "testing" + ], + "virtual": "amd-v" + }, + "type": "node", + "uid": "sirius-1" +} \ No newline at end of file diff --git a/data/grid5000/sites/lyon/clusters/sirius/sirius.json b/data/grid5000/sites/lyon/clusters/sirius/sirius.json new file mode 100644 index 0000000000000000000000000000000000000000..2e2ec9d898fcb23389a33c019c8ab2948460a106 --- /dev/null +++ b/data/grid5000/sites/lyon/clusters/sirius/sirius.json @@ -0,0 +1,16 @@ +{ + "boot_type": "uefi", + "created_at": "Thu, 18 Nov 2021 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "metrics": [ + + ], + "model": "NVidia DGX A100", + "queues": [ + "admin", + "testing" + ], + "type": "cluster", + "uid": "sirius" +} \ No newline at end of file diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml index 5709566b1d19ddd2e41aac48365e5ac50030695f..27ff6692bcc3d2552416563164dc242a96f4cbb9 100644 --- a/input/grid5000/disks.yaml +++ b/input/grid5000/disks.yaml @@ -98,6 +98,8 @@ disk_vendor_model_mapping: - Dell Ent NVMe AGN MU AIC 1.6TB Samsung: - SAMSUNG MZ1LB1T9HALS-00007 + Kioxia: + - KCM6DRUL3T84 Unknown: - unknown diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index 89431cef3d9fa9363e109ab6acc5b7c706a88487..2d358a819198a4b55a4d9325d0e9bf9bed7e07bd 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -34,6 +34,7 @@ ipv4: lyon pyxis eth0 0 0 6 0 lyon neowise eth0 0 0 7 0 lyon neowise eth1 0 0 7 10 + lyon sirius eth0 0 0 8 0 nancy graffiti eth2 0 0 0 0 nancy gros eth0 0 0 2 0 nancy gros eth1 0 0 2 128 diff --git a/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml b/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c900e9a9cdc904af7a702d3536b0fe80d8f265ab --- /dev/null +++ b/input/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.yaml @@ -0,0 +1,271 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +sirius-1: + architecture: + cpu_core_numbering: contiguous + nb_cores: 128 + nb_procs: 2 + nb_threads: 256 + platform_type: x86_64 + bios: + release_date: 02/08/2021 + vendor: American Megatrends Inc. + version: 0.34 + bmc_version: '0.14' + chassis: + manufacturer: NVIDIA + name: DGXA100 920-23687-2530-000 + serial: 1572221610085 + main_memory: + ram_size: 1099511627776 + memory_devices: + dimm_cpu0_dimm_a1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_b1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_c1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_d1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_e1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_f1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_g1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu0_dimm_h1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_i1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_j1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_k1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_l1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_m1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_n1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_o1: + firmware: Unknown + size: 68719476736 + technology: dram + dimm_cpu1_dimm_p1: + firmware: Unknown + size: 68719476736 + technology: dram + network_adapters: + bmc: + ip: 172.17.56.1 + mac: 5c:ff:35:e3:84:be + management: true + eth0: + driver: igb + firmware_version: 3.25, 0x800005cc + interface: Ethernet + ip: 172.16.56.1 + mac: 5c:ff:35:e3:84:29 + management: false + model: I210 Gigabit Network Connection + name: eth0 + rate: 1000000000 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eth1: + driver: mlx5_core + firmware_version: 20.28.4000 (MT_0000000225) + interface: Ethernet + mac: b8:ce:f6:2d:18:d6 + management: false + model: MT28908 Family [ConnectX-6] + name: eth1 + sriov: false + sriov_totalvfs: 0 + vendor: Mellanox Technologies + eth2: + driver: mlx5_core + firmware_version: 20.28.4000 (MT_0000000225) + interface: Ethernet + mac: b8:ce:f6:2d:18:d7 + management: false + model: MT28908 Family [ConnectX-6] + name: eth2 + sriov: false + sriov_totalvfs: 0 + vendor: Mellanox Technologies + ib0: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300632c5c' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:2c:5c + management: false + model: MT28908 Family [ConnectX-6] + name: ib0 + rate: 10000000000 + vendor: Mellanox Technologies + ib1: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300632c54' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:2c:54 + management: false + model: MT28908 Family [ConnectX-6] + name: ib1 + rate: 10000000000 + vendor: Mellanox Technologies + ib2: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300632388' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:23:88 + management: false + model: MT28908 Family [ConnectX-6] + name: ib2 + rate: 10000000000 + vendor: Mellanox Technologies + ib3: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef603007d8592' + interface: InfiniBand + mac: b8:ce:f6:03:00:7d:85:92 + management: false + model: MT28908 Family [ConnectX-6] + name: ib3 + rate: 10000000000 + vendor: Mellanox Technologies + ib4: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300633c8c' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:3c:8c + management: false + model: MT28908 Family [ConnectX-6] + name: ib4 + rate: 10000000000 + vendor: Mellanox Technologies + ib5: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300633c94' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:3c:94 + management: false + model: MT28908 Family [ConnectX-6] + name: ib5 + rate: 10000000000 + vendor: Mellanox Technologies + ib6: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef60300632310' + interface: InfiniBand + mac: b8:ce:f6:03:00:63:23:10 + management: false + model: MT28908 Family [ConnectX-6] + name: ib6 + rate: 10000000000 + vendor: Mellanox Technologies + ib7: + driver: mlx5_core + firmware_version: 20.28.4000 + guid: '0xb8cef603007d8002' + interface: InfiniBand + mac: b8:ce:f6:03:00:7d:80:02 + management: false + model: MT28908 Family [ConnectX-6] + name: ib7 + rate: 10000000000 + vendor: Mellanox Technologies + operating_system: + cstate_driver: none + cstate_governor: menu + ht_enabled: true + pstate_driver: acpi-cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 524288 + cache_l3: 16777216 + ht_capable: true + instruction_set: x86-64 + microcode: '0x8301034' + model: AMD EPYC + other_description: AMD EPYC 7742 64-Core Processor + vendor: AMD + version: 7742 + storage_devices: + pci-0000:09:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485ce01" + by_path: "/dev/disk/by-path/pci-0000:09:00.0-nvme-1" + model: KCM6DRUL3T84 + size: 3840755982336 + storage: SSD + pci-0000:22:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.34333630522580960025384100000001" + by_path: "/dev/disk/by-path/pci-0000:22:00.0-nvme-1" + model: SAMSUNG MZ1LB1T9HALS-00007 + size: 1920383410176 + storage: SSD + pci-0000:23:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.34333630522580930025384100000001" + by_path: "/dev/disk/by-path/pci-0000:23:00.0-nvme-1" + model: SAMSUNG MZ1LB1T9HALS-00007 + size: 1920383410176 + storage: SSD + pci-0000:52:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20486ae01" + by_path: "/dev/disk/by-path/pci-0000:52:00.0-nvme-1" + model: KCM6DRUL3T84 + size: 3840755982336 + storage: SSD + pci-0000:8a:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485e901" + by_path: "/dev/disk/by-path/pci-0000:8a:00.0-nvme-1" + model: KCM6DRUL3T84 + size: 3840755982336 + storage: SSD + pci-0000:ca:00.0-nvme-1: + by_id: "/dev/disk/by-id/nvme-eui.00000000000000008ce38ee20485da01" + by_path: "/dev/disk/by-path/pci-0000:ca:00.0-nvme-1" + model: KCM6DRUL3T84 + size: 3840755982336 + storage: SSD + supported_job_types: + virtual: amd-v diff --git a/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml b/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml new file mode 100644 index 0000000000000000000000000000000000000000..456553921a1f8bf0eedd04ca7c11010609e235f8 --- /dev/null +++ b/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml @@ -0,0 +1,56 @@ +model: NVidia DGX A100 +created_at: 2021-11-18 +kavlan: false +exotic: false +boot_type: uefi +queues: + - admin + - testing +nodes: + sirius-[1-1]: + supported_job_types: + deploy: true + besteffort: true + max_walltime: 0 + processor: + microarchitecture: Zen 2 + clock_speed: 2100000000 + software: + standard-environment: debian11-x64-std + 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 + storage_devices: + pci-0000:22:00.0-nvme-1: + interface: NVME + id : disk0 + pci-0000:23:00.0-nvme-1: + interface: NVME + id: disk1 + pci-0000:09:00.0-nvme-1: + interface: NVME + id: disk2 + pci-0000:52:00.0-nvme-1: + interface: NVME + id: disk3 + pci-0000:8a:00.0-nvme-1: + interface: NVME + id: disk5 + pci-0000:ca:00.0-nvme-1: + interface: NVME + id: disk4 diff --git a/input/grid5000/sites/lyon/clusters/sirius/sirius_ib.yaml b/input/grid5000/sites/lyon/clusters/sirius/sirius_ib.yaml new file mode 100644 index 0000000000000000000000000000000000000000..13dac9592657d925d6b1c49f560c4fc5bd3b631f --- /dev/null +++ b/input/grid5000/sites/lyon/clusters/sirius/sirius_ib.yaml @@ -0,0 +1,36 @@ +--- +nodes: + sirius-[1-1]: + network_adapters: + ib0: + enabled: true + mountable: true + mounted: true + ib1: + enabled: true + mountable: true + mounted: false + ib2: + enabled: true + mountable: true + mounted: false + ib3: + enabled: false + mountable: false + mounted: false + ib4: + enabled: false + mountable: false + mounted: false + ib5: + enabled: false + mountable: false + mounted: false + ib6: + enabled: false + mountable: false + mounted: false + ib7: + enabled: false + mountable: false + mounted: false diff --git a/lib/refrepo/g5kchecks_importer.rb b/lib/refrepo/g5kchecks_importer.rb index 562de6f01afd00405743e0106033feb27b5d1511..fca19230552fb59f6db1c45ef09b3aed194d99cc 100644 --- a/lib/refrepo/g5kchecks_importer.rb +++ b/lib/refrepo/g5kchecks_importer.rb @@ -1,6 +1,6 @@ require 'refrepo/hash/hash' -INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ibs1 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ib0.8100) +INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ib0.8100) def g5kchecks_importer(sourcedir) puts "Importing source files from #{sourcedir} into input directory..." diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb index a99bba729c404b515adf0ac8a4219f5c123a3128..aa856e0767c17276b1a52264f609a1349621cebf 100644 --- a/lib/refrepo/gen/reference-api.rb +++ b/lib/refrepo/gen/reference-api.rb @@ -136,7 +136,7 @@ def generate_reference_api node["storage_devices"] = node["storage_devices"].sort_by{ |sd, v| v['id'] }.map { |a| a[1] } node["network_adapters"].each { |key, hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash - node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ibs1","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1"]).values + node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1"]).values node["memory_devices"].each { |key, hash| node["memory_devices"][key]["device"] = key; } # Add "device: dimm_a1" within the hash node["memory_devices"] = node["memory_devices"].sort_by { |d, _| diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb index aa4e6c20616d0bb09d31a8a8400d5fb659930919..82ea2c4cc8242b9f4c9b042d5c4a43e9b2fb1745 100644 --- a/lib/refrepo/input_loader.rb +++ b/lib/refrepo/input_loader.rb @@ -188,7 +188,7 @@ def add_default_values_and_mappings(h) raise "Model \"#{hash["model"]}\" don't match any vendor in input/grid5000/disks.yaml" if matching_vendor.empty? raise "Model \"#{hash["model"]}\" specify in multiple vendors: #{matching_vendor.keys} in input/grid5000/disks.yaml" if matching_vendor.length > 1 - raise "Model \"#{hash["model"]}\" specify in multiple interface: #{matching_interface} in input/grid5000/disks.yaml" if matching_interface.length > 1 + raise "Model \"#{hash["model"]}\" specify in multiple interface: #{matching_interface} in input/grid5000/disks.yaml" if matching_interface.length > 1 unless hash["model"] == "unknown" hash['vendor'] = matching_vendor.keys.first if matching_interface.first != 'RAID' && hash['interface'] != matching_interface.first