diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
deleted file mode 100644
index 02a110661da595cd19931e290594513896bd5fe1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json
+++ /dev/null
@@ -1,217 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 12,
- "nb_procs": 2,
- "nb_threads": 24,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "09/17/2013",
- "vendor": "Dell Inc.",
- "version": 1.71
- },
- "bmc_version": "1.33",
- "chassis": {
- "manufacturer": "Dell",
- "name": "C6100",
- "serial": "857XY4J"
- },
- "exotic": false,
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.193.8",
- "kavlan-11": "10.7.232.8",
- "kavlan-12": "10.11.232.8",
- "kavlan-13": "10.15.232.8",
- "kavlan-14": "10.19.232.8",
- "kavlan-16": "10.27.232.8",
- "kavlan-18": "10.35.232.8",
- "kavlan-2": "192.168.209.8",
- "kavlan-20": "10.43.232.8",
- "kavlan-21": "10.47.232.8",
- "kavlan-3": "192.168.225.8",
- "kavlan-4": "10.32.1.8",
- "kavlan-5": "10.32.65.8",
- "kavlan-6": "10.32.129.8",
- "kavlan-7": "10.32.193.8",
- "kavlan-8": "10.33.1.8",
- "kavlan-9": "10.33.65.8"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:880:5::8",
- "kavlan-11": "2001:660:4406:1a0:805::8",
- "kavlan-12": "2001:660:4406:2a0:805::8",
- "kavlan-13": "2001:660:4406:4a0:805::8",
- "kavlan-14": "2001:660:4406:5a0:805::8",
- "kavlan-16": "2001:660:4406:7a0:805::8",
- "kavlan-18": "2001:660:4406:8a0:805::8",
- "kavlan-2": "2001:660:4406:881:5::8",
- "kavlan-20": "2001:660:4406:3a0:805::8",
- "kavlan-21": "2001:660:4406:6a0:805::8",
- "kavlan-3": "2001:660:4406:882:5::8",
- "kavlan-4": "2001:660:4406:890:5::8",
- "kavlan-5": "2001:660:4406:891:5::8",
- "kavlan-6": "2001:660:4406:892:5::8",
- "kavlan-7": "2001:660:4406:893:5::8",
- "kavlan-8": "2001:660:4406:894:5::8",
- "kavlan-9": "2001:660:4406:895:5::8"
- }
- },
- "main_memory": {
- "ram_size": 103079215104
- },
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "igb",
- "enabled": true,
- "firmware_version": "1.4.3",
- "interface": "Ethernet",
- "ip": "172.16.132.8",
- "ip6": "2001:660:4406:800:5::8",
- "kavlan": true,
- "mac": "00:26:6c:f8:3a:14",
- "management": false,
- "model": "82576 Gigabit Network Connection",
- "mountable": true,
- "mounted": true,
- "name": "eno1",
- "network_address": "uvb-8.sophia.grid5000.fr",
- "rate": 1000000000,
- "sriov": true,
- "sriov_totalvfs": 7,
- "switch": "gw",
- "switch_port": "GigabitEthernet4/24",
- "vendor": "Intel"
- },
- {
- "device": "eth1",
- "driver": "igb",
- "enabled": false,
- "firmware_version": "1.4.3",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:26:6c:f8:3a:15",
- "management": false,
- "model": "82576 Gigabit Network Connection",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "sriov": true,
- "sriov_totalvfs": 7,
- "vendor": "Intel"
- },
- {
- "device": "ib0",
- "driver": "mlx4_core",
- "enabled": true,
- "firmware_version": "2.9.1000",
- "guid": "0x0024e89097ffc669",
- "interface": "InfiniBand",
- "ip": "172.18.132.8",
- "kavlan": false,
- "mac": "00:24:e8:90:97:ff:c6:69",
- "management": false,
- "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
- "mountable": true,
- "mounted": true,
- "name": "ib0",
- "netmask": "255.255.240.0",
- "network_address": "uvb-8-ib0.sophia.grid5000.fr",
- "rate": 40000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "ib1",
- "driver": "mlx4_core",
- "enabled": false,
- "firmware_version": "2.9.1000",
- "guid": "0x0024e89097ffc66a",
- "interface": "InfiniBand",
- "kavlan": false,
- "mac": "00:24:e8:90:97:ff:c6:6a",
- "management": false,
- "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
- "mountable": false,
- "mounted": false,
- "name": "ib1",
- "rate": 10000000000,
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.132.8",
- "kavlan": false,
- "mac": "00:26:6c:f8:3a:16",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "uvb-8-bmc.sophia.grid5000.fr"
- }
- ],
- "operating_system": {
- "cstate_driver": "intel_idle",
- "cstate_governor": "menu",
- "ht_enabled": true,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "performance": {
- "core_flops": 11800000000,
- "node_flops": 141600000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 12582912,
- "clock_speed": 2950000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Westmere",
- "microcode": "0x1f",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU X5670 @ 2.93GHz",
- "vendor": "Intel",
- "version": "X5670"
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2021070100",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x50014ee1037d9480",
- "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
- "device": "sda",
- "firmware_version": "02.03B05",
- "id": "disk0",
- "interface": "SATA",
- "model": "WDC WD2502ABYS-1",
- "size": 250000000000,
- "storage": "HDD",
- "vendor": "Western Digital"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 0,
- "queues": [
- "default",
- "admin"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "uvb-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index dcabdce2894cff7ec2ff5187bab03dd481b94463..fdad402adc1c71ee116c4ff2febca258d1188cdf 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -256,14 +256,6 @@
"port": "eth0",
"snmp_name": "GigabitEthernet4/22",
"uid": "uvb-7"
- },
- {
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "GigabitEthernet4/24",
- "uid": "uvb-8"
}
],
"rate": 1000000000,
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
deleted file mode 100644
index 717c51a06c58bb9d0a147211ad43ae6faedb044d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-uvb-8:
- architecture:
- cpu_core_numbering: contiguous
- nb_cores: 12
- nb_procs: 2
- nb_threads: 24
- platform_type: x86_64
- bios:
- release_date: '09/17/2013'
- vendor: Dell Inc.
- version: 1.71
- bmc_version: '1.33'
- chassis:
- manufacturer: Dell
- name: C6100
- serial: 857XY4J
- main_memory:
- ram_size: 103079215104
- network_adapters:
- bmc:
- ip: 172.17.132.8
- mac: 00:26:6c:f8:3a:16
- management: true
- eth0:
- driver: igb
- firmware_version: 1.4.3
- interface: Ethernet
- ip: 172.16.132.8
- mac: 00:26:6c:f8:3a:14
- management: false
- model: 82576 Gigabit Network Connection
- name: eno1
- rate: 1000000000
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- eth1:
- driver: igb
- firmware_version: 1.4.3
- interface: Ethernet
- mac: 00:26:6c:f8:3a:15
- management: false
- model: 82576 Gigabit Network Connection
- name: eno2
- sriov: true
- sriov_totalvfs: 7
- vendor: Intel
- ib0:
- driver: mlx4_core
- firmware_version: 2.9.1000
- guid: '0x0024e89097ffc669'
- interface: InfiniBand
- ip: 172.18.132.8
- mac: 00:24:e8:90:97:ff:c6:69
- management: false
- model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
- name: ib0
- rate: 40000000000
- vendor: Mellanox Technologies
- ib1:
- driver: mlx4_core
- firmware_version: 2.9.1000
- guid: '0x0024e89097ffc66a'
- interface: InfiniBand
- mac: 00:24:e8:90:97:ff:c6:6a
- management: false
- model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
- name: ib1
- rate: 10000000000
- vendor: Mellanox Technologies
- operating_system:
- cstate_driver: intel_idle
- cstate_governor: menu
- ht_enabled: true
- pstate_driver: none
- pstate_governor: none
- turboboost_enabled: false
- processor:
- cache_l1d: 32768
- cache_l1i: 32768
- cache_l2: 262144
- cache_l3: 12582912
- ht_capable: true
- instruction_set: x86-64
- microcode: '0x1f'
- model: Intel Xeon
- other_description: Intel(R) Xeon(R) CPU X5670 @ 2.93GHz
- vendor: Intel
- version: X5670
- storage_devices:
- sda:
- by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9480"
- by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
- firmware_version: 02.03B05
- id: disk0
- model: WDC WD2502ABYS-1
- size: 250000000000
- storage: HDD
- supported_job_types:
- virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml.erb b/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml.erb
index c95f39dbc2eb8fd24c25d8fce5ca7813d56510c3..fd3e10b88841ae5e04d5c9ca66099879fdc1dc50 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml.erb
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml.erb
@@ -1,6 +1,6 @@
---
nodes:
-<% [3, 13, 15, 19, 20, 21, 22, 23, 24, 30, 32, 39, 40].each do |i| %>
+<% [3, 8, 13, 15, 19, 20, 21, 22, 23, 24, 30, 32, 39, 40].each do |i| %>
uvb-<%= i %>:
status: retired
<% end %>
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 1c87ef97dd1729a5e9727a08442261f5d07ef4ce..3a1b3551233db41286bdb142ac89dfd5022efa87 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -184,7 +184,6 @@ gw:
18: uvb-5
20: uvb-6
22: uvb-7
- 24: uvb-8
7:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"