diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
deleted file mode 100644
index 0e0d9221ab2238586636bedce15196c6b155b020..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ /dev/null
@@ -1,200 +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": "XG052422741"
- },
- "kavlan": {
- "eth1": {
- "kavlan-1": "192.168.192.7",
- "kavlan-11": "10.7.200.7",
- "kavlan-12": "10.11.200.7",
- "kavlan-13": "10.15.200.7",
- "kavlan-14": "10.19.200.7",
- "kavlan-16": "10.27.200.7",
- "kavlan-18": "10.35.200.7",
- "kavlan-2": "192.168.208.7",
- "kavlan-20": "10.43.200.7",
- "kavlan-21": "10.47.200.7",
- "kavlan-3": "192.168.224.7",
- "kavlan-4": "10.12.0.7",
- "kavlan-5": "10.12.64.7",
- "kavlan-6": "10.12.128.7",
- "kavlan-7": "10.12.192.7",
- "kavlan-8": "10.13.0.7",
- "kavlan-9": "10.13.64.7"
- }
- },
- "kavlan6": {
- "eth1": {
- "kavlan-1": "2001:660:4406:481:2::7",
- "kavlan-11": "2001:660:4406:48b:2::7",
- "kavlan-12": "2001:660:4406:48c:2::7",
- "kavlan-13": "2001:660:4406:48d:2::7",
- "kavlan-14": "2001:660:4406:48e:2::7",
- "kavlan-16": "2001:660:4406:490:2::7",
- "kavlan-18": "2001:660:4406:492:2::7",
- "kavlan-2": "2001:660:4406:482:2::7",
- "kavlan-20": "2001:660:4406:494:2::7",
- "kavlan-21": "2001:660:4406:495:2::7",
- "kavlan-3": "2001:660:4406:483:2::7",
- "kavlan-4": "2001:660:4406:484:2::7",
- "kavlan-5": "2001:660:4406:485:2::7",
- "kavlan-6": "2001:660:4406:486:2::7",
- "kavlan-7": "2001:660:4406:487:2::7",
- "kavlan-8": "2001:660:4406:488:2::7",
- "kavlan-9": "2001:660:4406:489:2::7"
- }
- },
- "main_memory": {
- "ram_size": 2147483648
- },
- "monitoring": {
- "wattmeter": "true"
- },
- "network_adapters": [
- {
- "bridged": false,
- "device": "eth0",
- "driver": "tg3",
- "enabled": false,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "00:09:3d:12:7f:e9",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "enp2s2f0",
- "vendor": "Broadcom"
- },
- {
- "bridged": true,
- "device": "eth1",
- "driver": "tg3",
- "enabled": true,
- "firmware_version": "5704-v3.27",
- "interface": "Ethernet",
- "ip": "172.16.49.7",
- "ip6": "2001:660:4406:400:2::7",
- "kavlan": true,
- "mac": "00:09:3d:12:7f:ea",
- "management": false,
- "model": "NetXtreme BCM5704 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "enp2s2f1",
- "network_address": "sagittaire-7.lyon.grid5000.fr",
- "rate": 1000000000,
- "switch": "salome",
- "switch_port": "GigabitEthernet27",
- "vendor": "Broadcom"
- },
- {
- "device": "bmc",
- "driver": "bnx2",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.49.7",
- "kavlan": false,
- "mac": "00:09:3d:12:7f:eb",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "sagittaire-7-bmc.lyon.grid5000.fr",
- "rate": 1000000000
- }
- ],
- "operating_system": {
- "cstate_driver": "none",
- "cstate_governor": "menu",
- "ht_enabled": false,
- "pstate_driver": "none",
- "pstate_governor": "none",
- "turboboost_enabled": false
- },
- "performance": {
- "core_flops": 3929000000,
- "node_flops": 7440000000
- },
- "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
- },
- "sensors": {
- "power": {
- "available": true,
- "per_outlets": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 6,
- "uid": "wattmetre1"
- }
- ],
- "www": {
- "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
- }
- }
- }
- },
- "software": {
- "forced-deployment-timestamp": 202004301056,
- "postinstall-version": "1.2020043000",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "",
- "by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
- "device": "sda",
- "firmware_version": 104,
- "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-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index 3f38991c2982a3872d651740840f71e64a69fade..c25a7a1ae914d603a43e0ae480aaca574a8df04a 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -28,10 +28,8 @@
"2": "sagittaire-3",
"20": "sagittaire-30",
"21": "sagittaire-31",
- "22": "sagittaire-32",
- "23": "sagittaire-33",
- "24": "sagittaire-34",
- "25": "sagittaire-43",
+ "24": "pyxis-2",
+ "25": "pyxis-3",
"26": "gemini-2",
"27": "gemini-2",
"28": "gemini-2",
@@ -45,7 +43,6 @@
"4": "sagittaire-5",
"45": "pyxis-1",
"5": "sagittaire-6",
- "6": "sagittaire-7",
"7": "sagittaire-11",
"8": "sagittaire-12",
"9": "sagittaire-13"
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index 0fef20f69a9b06d019d53916dffe44eec46d390b..c954a53067f65300304fd330842b2d755639d733 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -8,7 +8,7 @@ queues:
- admin
nodes:
- sagittaire-[8-10]:
+ sagittaire-[7-10]:
status: retired
sagittaire-[21-23]:
status: retired
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
index 844142c6efaea015a87f65049b5059f0af2900a2..18a7fdbc455f93800e9ec584974c994e28a76ada 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_pdu.yaml
@@ -24,10 +24,6 @@ nodes:
pdu:
- uid: wattmetre1
port: 5
- sagittaire-7:
- pdu:
- - uid: wattmetre1
- port: 6
sagittaire-11:
pdu:
- uid: wattmetre1
@@ -88,19 +84,3 @@ nodes:
pdu:
- uid: wattmetre1
port: 21
- sagittaire-32:
- pdu:
- - uid: wattmetre1
- port: 22
- sagittaire-33:
- pdu:
- - uid: wattmetre1
- port: 23
- sagittaire-34:
- pdu:
- - uid: wattmetre1
- port: 24
- sagittaire-43:
- pdu:
- - uid: wattmetre1
- port: 25