diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
deleted file mode 100644
index f7ce4e662b42f65e2c6b0e094c7ccf5d03334b2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 2,
- "nb_procs": 2,
- "nb_threads": 2,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "04/25/2006",
- "vendor": "Phoenix Technologies Ltd.",
- "version": "V1.35.2.2"
- },
- "bmc_version": "2.04",
- "chassis": {
- "manufacturer": "Sun Microsystems",
- "name": "Sun Fire V20z",
- "serial": "XG052081146"
- },
- "exotic": false,
- "kavlan": {
- "eth1": {
- "kavlan-1": "192.168.192.17",
- "kavlan-11": "10.7.200.17",
- "kavlan-12": "10.11.200.17",
- "kavlan-13": "10.15.200.17",
- "kavlan-14": "10.19.200.17",
- "kavlan-16": "10.27.200.17",
- "kavlan-18": "10.35.200.17",
- "kavlan-2": "192.168.208.17",
- "kavlan-20": "10.43.200.17",
- "kavlan-21": "10.47.200.17",
- "kavlan-3": "192.168.224.17",
- "kavlan-4": "10.12.0.17",
- "kavlan-5": "10.12.64.17",
- "kavlan-6": "10.12.128.17",
- "kavlan-7": "10.12.192.17",
- "kavlan-8": "10.13.0.17",
- "kavlan-9": "10.13.64.17"
- }
- },
- "kavlan6": {
- "eth1": {
- "kavlan-1": "2001:660:4406:480:2::11",
- "kavlan-11": "2001:660:4406:1a0:402::11",
- "kavlan-12": "2001:660:4406:2a0:402::11",
- "kavlan-13": "2001:660:4406:4a0:402::11",
- "kavlan-14": "2001:660:4406:5a0:402::11",
- "kavlan-16": "2001:660:4406:7a0:402::11",
- "kavlan-18": "2001:660:4406:8a0:402::11",
- "kavlan-2": "2001:660:4406:481:2::11",
- "kavlan-20": "2001:660:4406:3a0:402::11",
- "kavlan-21": "2001:660:4406:6a0:402::11",
- "kavlan-3": "2001:660:4406:482:2::11",
- "kavlan-4": "2001:660:4406:490:2::11",
- "kavlan-5": "2001:660:4406:491:2::11",
- "kavlan-6": "2001:660:4406:492:2::11",
- "kavlan-7": "2001:660:4406:493:2::11",
- "kavlan-8": "2001:660:4406:494:2::11",
- "kavlan-9": "2001:660:4406:495:2::11"
- }
- },
- "main_memory": {
- "ram_size": 2147483648
- },
- "management_tools": {
- "bmc_vendor_tool": "ipmitool",
- "ipmitool": {
- "retries": 5
- }
- },
- "memory_devices": [
- {
- "device": "dimm_0_cpu0",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_0_cpu1",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_1_cpu0",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_1_cpu1",
- "size": 536870912,
- "technology": "dram"
- }
- ],
- "network_adapters": [
- {
- "bridged": false,
- "device": "eth0",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:09:3d:11:e7:62",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "enp2s2f0",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "bridged": true,
- "device": "eth1",
- "driver": "tg3",
- "enabled": true,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "ip": "172.16.49.17",
- "ip6": "2001:660:4406:400:2::11",
- "kavlan": true,
- "mac": "00:09:3d:11:e7:63",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "enp2s2f1",
- "network_address": "sagittaire-17.lyon.grid5000.fr",
- "rate": 1000000000,
- "sriov": false,
- "sriov_totalvfs": 0,
- "switch": "salome",
- "switch_port": "GigabitEthernet34",
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "device": "bmc",
- "driver": "bnx2",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.49.17",
- "kavlan": false,
- "mac": "00:09:3d:11:e7:64",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "sagittaire-17-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "acpi_idle",
- "cstate_governor": "menu",
- "ht_enabled": false,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "pdu": [
- {
- "port": 13,
- "uid": "wattmetre1"
- }
- ],
- "performance": {
- "core_flops": 4800000000,
- "node_flops": 9600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 65536,
- "cache_l1i": 65536,
- "cache_l2": 1048576,
- "cache_l3": 0,
- "clock_speed": 2400000000,
- "ht_capable": false,
- "instruction_set": "x86-64",
- "microarchitecture": "K8",
- "microcode": "0x3a",
- "model": "AMD Opteron",
- "other_description": "AMD Opteron(tm) Processor 250",
- "vendor": "AMD",
- "version": 250
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2022012700",
- "standard-environment": "debian11-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
- "firmware_version": 104,
- "id": "disk0",
- "interface": "SCSI",
- "model": "MAT3073NC",
- "size": 73543163904,
- "storage": "HDD",
- "vendor": "Fujitsu"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": false
- },
- "type": "node",
- "uid": "sagittaire-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
deleted file mode 100644
index b8db6bcde82d0b506092fd558107f3a3e798e9f9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 2,
- "nb_procs": 2,
- "nb_threads": 2,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "04/25/2006",
- "vendor": "Phoenix Technologies Ltd.",
- "version": "V1.35.2.2"
- },
- "bmc_version": "2.04",
- "chassis": {
- "manufacturer": "Sun Microsystems",
- "name": "Sun Fire V20z",
- "serial": "XG052429080"
- },
- "exotic": false,
- "kavlan": {
- "eth1": {
- "kavlan-1": "192.168.192.18",
- "kavlan-11": "10.7.200.18",
- "kavlan-12": "10.11.200.18",
- "kavlan-13": "10.15.200.18",
- "kavlan-14": "10.19.200.18",
- "kavlan-16": "10.27.200.18",
- "kavlan-18": "10.35.200.18",
- "kavlan-2": "192.168.208.18",
- "kavlan-20": "10.43.200.18",
- "kavlan-21": "10.47.200.18",
- "kavlan-3": "192.168.224.18",
- "kavlan-4": "10.12.0.18",
- "kavlan-5": "10.12.64.18",
- "kavlan-6": "10.12.128.18",
- "kavlan-7": "10.12.192.18",
- "kavlan-8": "10.13.0.18",
- "kavlan-9": "10.13.64.18"
- }
- },
- "kavlan6": {
- "eth1": {
- "kavlan-1": "2001:660:4406:480:2::12",
- "kavlan-11": "2001:660:4406:1a0:402::12",
- "kavlan-12": "2001:660:4406:2a0:402::12",
- "kavlan-13": "2001:660:4406:4a0:402::12",
- "kavlan-14": "2001:660:4406:5a0:402::12",
- "kavlan-16": "2001:660:4406:7a0:402::12",
- "kavlan-18": "2001:660:4406:8a0:402::12",
- "kavlan-2": "2001:660:4406:481:2::12",
- "kavlan-20": "2001:660:4406:3a0:402::12",
- "kavlan-21": "2001:660:4406:6a0:402::12",
- "kavlan-3": "2001:660:4406:482:2::12",
- "kavlan-4": "2001:660:4406:490:2::12",
- "kavlan-5": "2001:660:4406:491:2::12",
- "kavlan-6": "2001:660:4406:492:2::12",
- "kavlan-7": "2001:660:4406:493:2::12",
- "kavlan-8": "2001:660:4406:494:2::12",
- "kavlan-9": "2001:660:4406:495:2::12"
- }
- },
- "main_memory": {
- "ram_size": 2147483648
- },
- "management_tools": {
- "bmc_vendor_tool": "ipmitool",
- "ipmitool": {
- "retries": 5
- }
- },
- "memory_devices": [
- {
- "device": "dimm_0_cpu0",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_0_cpu1",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_1_cpu0",
- "size": 536870912,
- "technology": "dram"
- },
- {
- "device": "dimm_1_cpu1",
- "size": 536870912,
- "technology": "dram"
- }
- ],
- "network_adapters": [
- {
- "bridged": false,
- "device": "eth0",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:09:3d:12:7e:f1",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "enp2s2f0",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "bridged": true,
- "device": "eth1",
- "driver": "tg3",
- "enabled": true,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "ip": "172.16.49.18",
- "ip6": "2001:660:4406:400:2::12",
- "kavlan": true,
- "mac": "00:09:3d:12:7e:f2",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "enp2s2f1",
- "network_address": "sagittaire-18.lyon.grid5000.fr",
- "rate": 1000000000,
- "sriov": false,
- "sriov_totalvfs": 0,
- "switch": "salome",
- "switch_port": "GigabitEthernet35",
- "vendor": "Broadcom Inc. and subsidiaries"
- },
- {
- "device": "bmc",
- "driver": "bnx2",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.49.18",
- "kavlan": false,
- "mac": "00:09:3d:12:7e:f3",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "sagittaire-18-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "acpi_idle",
- "cstate_governor": "menu",
- "ht_enabled": false,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "pdu": [
- {
- "port": 14,
- "uid": "wattmetre1"
- }
- ],
- "performance": {
- "core_flops": 4800000000,
- "node_flops": 9600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 65536,
- "cache_l1i": 65536,
- "cache_l2": 1048576,
- "cache_l3": 0,
- "clock_speed": 2400000000,
- "ht_capable": false,
- "instruction_set": "x86-64",
- "microarchitecture": "K8",
- "microcode": "0x3a",
- "model": "AMD Opteron",
- "other_description": "AMD Opteron(tm) Processor 250",
- "vendor": "AMD",
- "version": 250
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2022012700",
- "standard-environment": "debian11-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
- "firmware_version": 2,
- "id": "disk0",
- "interface": "SCSI",
- "model": "ST373207LC",
- "size": 73407868928,
- "storage": "HDD",
- "vendor": "Seagate"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": false
- },
- "type": "node",
- "uid": "sagittaire-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 350c279a14d2af06040c4a74b19d799e7e2c550c..552ab476f9ef6a01efcb460db0d34f67b9f22c13 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -126,18 +126,6 @@
"port": "eth1",
"snmp_name": "GigabitEthernet33",
"uid": "sagittaire-16"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "GigabitEthernet34",
- "uid": "sagittaire-17"
- },
- {
- "kind": "node",
- "port": "eth1",
- "snmp_name": "GigabitEthernet35",
- "uid": "sagittaire-18"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index 1e44a8c03bae7c863a1bbd72bc1adee57be421da..710ee0f07bcd87e89092464a95476f764073b8e7 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -17,8 +17,6 @@
"10": "sagittaire-14",
"11": "sagittaire-15",
"12": "sagittaire-16",
- "13": "sagittaire-17",
- "14": "sagittaire-18",
"2": "sagittaire-3",
"24": "pyxis-2",
"25": "pyxis-3",
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
deleted file mode 100644
index 31fc4d067164a7ae290aff0ded728d0c25691826..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-17:
- architecture:
- cpu_core_numbering: round-robin
- nb_cores: 2
- nb_procs: 2
- nb_threads: 2
- platform_type: x86_64
- bios:
- release_date: 04/25/2006
- vendor: Phoenix Technologies Ltd.
- version: V1.35.2.2
- bmc_version: '2.04'
- chassis:
- manufacturer: Sun Microsystems
- name: Sun Fire V20z
- serial: XG052081146
- main_memory:
- ram_size: 2147483648
- memory_devices:
- dimm_0_cpu0:
- size: 536870912
- technology: dram
- dimm_0_cpu1:
- size: 536870912
- technology: dram
- dimm_1_cpu0:
- size: 536870912
- technology: dram
- dimm_1_cpu1:
- size: 536870912
- technology: dram
- network_adapters:
- bmc:
- ip: 172.17.49.17
- mac: 00:09:3d:11:e7:64
- management: true
- eth0:
- driver: tg3
- firmware_version: 5704-v3.27
- interface: Ethernet
- mac: 00:09:3d:11:e7:62
- management: false
- model: NetXtreme BCM5704 Gigabit Ethernet
- name: enp2s2f0
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- eth1:
- driver: tg3
- firmware_version: 5704-v3.27
- interface: Ethernet
- ip: 172.16.49.17
- mac: 00:09:3d:11:e7:63
- management: false
- model: NetXtreme BCM5704 Gigabit Ethernet
- name: enp2s2f1
- rate: 1000000000
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- operating_system:
- cstate_driver: acpi_idle
- cstate_governor: menu
- ht_enabled: false
- pstate_driver: none
- pstate_governor: none
- turboboost_enabled: false
- processor:
- cache_l1d: 65536
- cache_l1i: 65536
- cache_l2: 1048576
- cache_l3: 0
- ht_capable: false
- instruction_set: x86-64
- microcode: '0x3a'
- model: AMD Opteron
- other_description: AMD Opteron(tm) Processor 250
- vendor: AMD
- version: 250
- storage_devices:
- pci-0000:02:04.0-scsi-0:0:1:0:
- by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
- firmware_version: 104
- model: MAT3073NC
- size: 73543163904
- storage: HDD
- supported_job_types:
- virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
deleted file mode 100644
index 381ddd3bea573ebc44c0d3ee65d2a20cb0a8a7f3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-18:
- architecture:
- cpu_core_numbering: round-robin
- nb_cores: 2
- nb_procs: 2
- nb_threads: 2
- platform_type: x86_64
- bios:
- release_date: 04/25/2006
- vendor: Phoenix Technologies Ltd.
- version: V1.35.2.2
- bmc_version: '2.04'
- chassis:
- manufacturer: Sun Microsystems
- name: Sun Fire V20z
- serial: XG052429080
- main_memory:
- ram_size: 2147483648
- memory_devices:
- dimm_0_cpu0:
- size: 536870912
- technology: dram
- dimm_0_cpu1:
- size: 536870912
- technology: dram
- dimm_1_cpu0:
- size: 536870912
- technology: dram
- dimm_1_cpu1:
- size: 536870912
- technology: dram
- network_adapters:
- bmc:
- ip: 172.17.49.18
- mac: 00:09:3d:12:7e:f3
- management: true
- eth0:
- driver: tg3
- firmware_version: 5704-v3.27
- interface: Ethernet
- mac: 00:09:3d:12:7e:f1
- management: false
- model: NetXtreme BCM5704 Gigabit Ethernet
- name: enp2s2f0
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- eth1:
- driver: tg3
- firmware_version: 5704-v3.27
- interface: Ethernet
- ip: 172.16.49.18
- mac: 00:09:3d:12:7e:f2
- management: false
- model: NetXtreme BCM5704 Gigabit Ethernet
- name: enp2s2f1
- rate: 1000000000
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom Inc. and subsidiaries
- operating_system:
- cstate_driver: acpi_idle
- cstate_governor: menu
- ht_enabled: false
- pstate_driver: none
- pstate_governor: none
- turboboost_enabled: false
- processor:
- cache_l1d: 65536
- cache_l1i: 65536
- cache_l2: 1048576
- cache_l3: 0
- ht_capable: false
- instruction_set: x86-64
- microcode: '0x3a'
- model: AMD Opteron
- other_description: AMD Opteron(tm) Processor 250
- vendor: AMD
- version: 250
- storage_devices:
- pci-0000:02:04.0-scsi-0:0:1:0:
- by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
- firmware_version: 2
- model: ST373207LC
- size: 73407868928
- storage: HDD
- supported_job_types:
- virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index e1f9e919fad298f75d467e853af4331d9265a41f..332dc41ef6b5ad1ac74e526c7a8ae5a8fdd123d7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -13,7 +13,7 @@ nodes:
status: retired
sagittaire-[7-10]:
status: retired
- sagittaire-[19-79]:
+ sagittaire-[17-79]:
status: retired
sagittaire-[1-79]:
@@ -73,18 +73,6 @@ nodes:
network_adapters:
eth1:
switch_port: '1:16'
- sagittaire-17:
- network_adapters:
- eth1:
- switch_port: '1:17'
- sagittaire-18:
- network_adapters:
- eth1:
- switch_port: '1:18'
- # sagittaire-19:
- # network_adapters:
- # eth1:
- # switch_port: '1:19'
sagittaire-2:
network_adapters:
eth1:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
index fd83aaa01d853cf98b00d8cd923dc53d39cad804..58d1dca57f16747f3e0e6b11758e97e71dfd6f00 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
@@ -44,18 +44,6 @@ nodes:
pdu:
- uid: wattmetre1
port: 12
- sagittaire-17:
- pdu:
- - uid: wattmetre1
- port: 13
- sagittaire-18:
- pdu:
- - uid: wattmetre1
- port: 14
- sagittaire-19:
- pdu:
- - uid: wattmetre1
- port: 15
sagittaire-24:
pdu:
- uid: wattmetre1
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index 504e30f054ac29838b9746857e2cda681ee88826..49215ba324dc4581e9eb32cd6c8315cdc5187067 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -82,5 +82,3 @@ salome:
31: sagittaire-14
32: sagittaire-15
33: sagittaire-16
- 34: sagittaire-17
- 35: sagittaire-18