diff --git a/input/grid5000/network_equipments/renater.yaml b/input/grid5000/network_equipments/renater.yaml
index 76fde8efadcf77eb3f91fa70c0599ba879c0dc21..0c2a148805ab0bc2f16075a93e74908710c6320f 100644
--- a/input/grid5000/network_equipments/renater.yaml
+++ b/input/grid5000/network_equipments/renater.yaml
@@ -16,7 +16,7 @@ renater-lille:
linecards:
0:
rate: 10000000000
- ports:
+ ports:
0:
uid: renater-paris
1:
diff --git a/input/grid5000/sites/grenoble/servers/servers.yaml b/input/grid5000/sites/grenoble/servers/servers.yaml
index 1efbc9df49e0cada112fe2e919f5ac2eed281f43..6df30aefaab17f1b4f275e6d6d969510d00a989c 100644
--- a/input/grid5000/sites/grenoble/servers/servers.yaml
+++ b/input/grid5000/sites/grenoble/servers/servers.yaml
@@ -56,7 +56,7 @@ digwatt:
digxp:
kind: physical
- alias:
+ alias:
warranty: n/a
serial: n/a
network_adapters:
@@ -69,7 +69,7 @@ digxp:
digarm:
kind: physical
- alias:
+ alias:
warranty: n/a
serial: n/a
network_adapters:
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 0976ba6a2e8d004160cd5028dbeffe4fc3d56fbe..76da4d9e2651894ed0d6ef2daeb2b541bd4fab21 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -253,10 +253,10 @@ frontend-dev:
mailbox:
kind: virtual
network_adapters:
- default:
+ default:
ip: 172.16.47.125
kwollect:
kind: virtual
- network_adapters:
+ network_adapters:
default:
ip: 172.16.47.157
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
index 48b35f9404e8d9b96035e7960dc6a650f60c0769..02fa2d8d1d2374f68044deea902b8242cd72d360 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
@@ -128,4 +128,4 @@ nodes:
switch_port: Te0/16
bmc:
switch_port: Gi2/36
-
+
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 66f62044f60e0f56c415d26310ea2036f939b1bc..0073de9f781355d3d8742fa9099338ad655337d5 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -67,10 +67,10 @@ nodes:
available: true
per_outlets: false
via:
- api:
- metric: pdu_shared
- www:
- url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
+ api:
+ metric: pdu_shared
+ www:
+ url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
hercule-1:
network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index bfba63fa6d8600cf512ad79be411c1fa0af665df..4c7d4234b98fa0c1fd260efcbfbd95a8c5f6ff0f 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -80,8 +80,8 @@ nodes:
via:
api:
metric: power
- www:
- url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
+ www:
+ url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
orion-1:
network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 39f4bf6c330321f730f1f95ffd1375cc4dec7df0..7a946a258bb9d8fa46e95a658a9a8b18d2333ddd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -21,18 +21,18 @@ sagittaire-73:
network_adapters:
bmc:
ip: 172.17.49.73
- mac:
+ mac:
eth0:
driver: tg3
interface: Ethernet
- mac:
+ mac:
management: false
mounted: false
eth1:
driver: tg3
interface: Ethernet
ip: 172.16.49.73
- mac:
+ mac:
management: false
mounted: true
rate: 1000000000
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index 84352d2657c880379ff369ce5592abec5cdf935e..fd4ed6f78d5193f27c789c71d345d0505edea797 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -30,12 +30,12 @@ nodes:
storage: HDD
network_adapters:
eth0:
- enabled: true
+ enabled: true
mountable: true
mounted: true
bridged: true
eth1:
- enabled: false
+ enabled: false
mountable: false
mounted: false
bridged: false
@@ -45,22 +45,22 @@ nodes:
mounted: false
bridged: false
eth3:
- enabled: false
+ enabled: false
mountable: false
mounted: false
bridged: false
eth4:
- enabled: false
+ enabled: false
mountable: false
mounted: false
bridged: false
eth5:
- enabled: false
+ enabled: false
mountable: false
mounted: false
bridged: false
ib0:
- enabled: true
+ enabled: true
mountable: true
mounted: true
bridged: false
@@ -78,7 +78,7 @@ nodes:
graoully-[5-]:
supported_job_types:
max_walltime: 604800
- graoully-[3-4]:
+ graoully-[3-4]:
supported_job_types:
max_walltime: 43200
graoully-[1-2]:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
index 2604d26bf9bade3456dd45201ed3cb830d306c4e..e7f781c82a9398962a3a0ceb745a3a0eaadb2cb3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
@@ -1,6 +1,6 @@
---
nodes:
- graoully-[1-16]:
+ graoully-[1-16]:
monitoring:
wattmeter: true
metric: power
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 42c9a231b570d595b7cc4ab4764dfe49fe703404..47a8077187899c1199efb48ee63f25108d2672a3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -63,7 +63,7 @@ nodes:
power:
available: true
via:
- api:
+ api:
metric: pdu
graphique-2:
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index 6b538e31edf61ca4ea528b292ad4130f80232454..433ed68d33b47b6a0c101285f9d7dfde57299cd7 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -56,7 +56,7 @@ nodes:
switch: null
switch_port: null
ib0:
- enabled: true
+ enabled: true
mountable: true
mounted: true
bridged: false
@@ -77,7 +77,7 @@ nodes:
power:
available: true
via:
- api:
+ api:
metric: pdu
@@ -88,7 +88,7 @@ nodes:
graphite-2:
mic:
- ip: 172.16.68.6
+ ip: 172.16.68.6
mac: 4C:79:BA:5C:01:18
graphite-3:
@@ -98,5 +98,5 @@ nodes:
graphite-4:
mic:
- ip: 172.16.68.8
+ ip: 172.16.68.8
mac: 4C:79:BA:5C:01:0C
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
index 92152bb7d9b0a206a8fda06626fc14e60f44cb1c..ce654f4baed2dbdfed2361a6ace006ff9f514f13 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
@@ -10,43 +10,43 @@ nodes:
- uid: grimani-pdu1
port: 7
- uid: grimani-pdu2
- port: 7
+ port: 7
grele-2:
pdu:
- uid: grimani-pdu1
port: 11
- uid: grimani-pdu2
- port: 11
+ port: 11
grele-3:
pdu:
- uid: grimani-pdu1
port: 12
- uid: grimani-pdu2
- port: 12
+ port: 12
grele-4:
pdu:
- uid: grimani-pdu1
port: 13
- uid: grimani-pdu2
- port: 13
+ port: 13
grele-5:
pdu:
- uid: grimani-pdu1
port: 14
- uid: grimani-pdu2
- port: 14
+ port: 14
grele-6:
pdu:
- uid: grimani-pdu1
port: 15
- uid: grimani-pdu2
- port: 15
+ port: 15
grele-7:
pdu:
- uid: grimani-pdu1
port: 9
- uid: grimani-pdu2
- port: 9
+ port: 9
grele-8:
pdu:
- uid: grimani-pdu1
@@ -58,35 +58,35 @@ nodes:
- uid: grimani-pdu1
port: 19
- uid: grimani-pdu2
- port: 19
+ port: 19
grele-10:
pdu:
- uid: grimani-pdu1
port: 20
- uid: grimani-pdu2
- port: 20
+ port: 20
grele-11:
pdu:
- uid: grimani-pdu1
port: 21
- uid: grimani-pdu2
- port: 21
+ port: 21
grele-12:
pdu:
- uid: grimani-pdu1
port: 22
- uid: grimani-pdu2
- port: 22
+ port: 22
grele-13:
pdu:
- uid: grimani-pdu1
port: 23
- uid: grimani-pdu2
- port: 23
+ port: 23
grele-14:
pdu:
- uid: grimani-pdu1
port: 17
- uid: grimani-pdu2
- port: 17
+ port: 17
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
index e624cfad93a2c72d11072ee8edd3ab8c7dab8ca7..c2d484044ab8a2fd8abc8edd3329ea3c1cc8a869 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
@@ -10,34 +10,34 @@ nodes:
- uid: grimani-pdu1
port: 1
- uid: grimani-pdu2
- port: 1
+ port: 1
grimani-2:
pdu:
- uid: grimani-pdu1
port: 2
- uid: grimani-pdu2
- port: 2
+ port: 2
grimani-3:
pdu:
- uid: grimani-pdu1
port: 3
- uid: grimani-pdu2
- port: 3
+ port: 3
grimani-4:
pdu:
- uid: grimani-pdu1
port: 4
- uid: grimani-pdu2
- port: 4
+ port: 4
grimani-5:
pdu:
- uid: grimani-pdu1
port: 5
- uid: grimani-pdu2
- port: 5
+ port: 5
grimani-6:
pdu:
- uid: grimani-pdu1
port: 6
- uid: grimani-pdu2
- port: 6
+ port: 6
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 8b86b62aad3ab1920b154d62743ac97ceb9774c3..9e12948880b97e85a30bc3dd03a959b1cfabd872 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -33,7 +33,7 @@ nodes:
sensors:
power:
available: true
- via:
+ via:
api:
metric: power
@@ -41,7 +41,7 @@ nodes:
grisou-[1-48]:
network_adapters:
eth0:
- enabled: true
+ enabled: true
mountable: true
bridged: true
mounted: true
@@ -66,7 +66,7 @@ nodes:
bridged: false
mounted: false
eth5:
- enabled: false
+ enabled: false
mountable: false
bridged: false
mounted: false
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
index d4e338e2bb432bdd6b4494fb6f53935e6a2485be..d2eeb8d012fe2e99ef0d9fe4b0e372fb0aec8b83 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -2,13 +2,13 @@
created_at: 2019-11-25
kavlan: true
queues:
- - production
+ - production
- admin
nodes:
grue-[1-5]:
supported_job_types:
deploy: true
- besteffort: true
+ besteffort: true
performance:
core_flops: 13438000000
node_flops: 430760000000
@@ -20,7 +20,7 @@
network_adapters:
bmc:
interface: Ethernet
- enabled: true
+ enabled: true
mountable: false
mounted: false
eth0:
@@ -54,10 +54,10 @@
cores_affinity: 3 19 11 27 5 21 13 29
grue-[1-2]:
supported_job_types:
- max_walltime: 86400
+ max_walltime: 86400
grue-[3-4]:
supported_job_types:
max_walltime: 172800
grue-[5-]:
supported_job_types:
- max_walltime: 604800
+ max_walltime: 604800
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 64d8ca65608b7d2846e89e8dc93eb522dcd540f6..c1627c67e54997e914da279a01481642e1dd568b 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -32,7 +32,7 @@ pdus:
unit: W
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
-
+
grimoire-pdu[1-2]:
vendor: APC
model: AP8653
@@ -53,7 +53,7 @@ pdus:
unit: W
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
-
+
grisou-pdu[1-2]:
vendor: APC
model: AP8653
@@ -95,7 +95,7 @@ pdus:
unit: W
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
-
+
graffiti-pdu[1-4]:
vendor: APC
model: AP8653
@@ -116,13 +116,13 @@ pdus:
unit: W
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
-
+
graoully-pdu1:
ip: 172.17.79.243
mac: 00:C0:B7:ED:63:AE
graoully-pdu2:
- ip: 172.17.79.244
+ ip: 172.17.79.244
mac: 00:C0:B7:85:13:9C
grimoire-pdu1:
@@ -144,7 +144,7 @@ pdus:
grimani-pdu1:
ip: 172.17.79.218
mac: 00:C0:B7:F2:27:D9
-
+
grimani-pdu2:
ip: 172.17.79.219
mac: 00:C0:B7:F2:27:DE
diff --git a/input/grid5000/sites/nancy/servers/servers.yaml b/input/grid5000/sites/nancy/servers/servers.yaml
index 93386aea854811b97f6fe2a872ca1ae060d0de3c..a3cc45d04236c227111481e79545dfb39a94f6a0 100644
--- a/input/grid5000/sites/nancy/servers/servers.yaml
+++ b/input/grid5000/sites/nancy/servers/servers.yaml
@@ -194,8 +194,8 @@ grcinq-srv-1:
mac: 90:B1:1C:3C:66:B3
ib0:
ip: 172.18.75.225
- ib1:
- ip: 172.18.76.225
+ ib1:
+ ip: 172.18.76.225
grcinq-srv-2:
kind: physical
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 2545d4423c54e592c6c98fb3d361af3193712728..5bb2439e7e041708619ebb512eb0611595f2804d 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -100,9 +100,9 @@ kwollect:
network_adapters: {default: {ip: 172.16.79.134}}
grcinq-puppet:
kind: virtual
- network_adapters:
- default:
- ip: 172.16.79.132
+ network_adapters:
+ default:
+ ip: 172.16.79.132
mac: 52:54:00:dc:57:63
sgrcinq1-ib-bmc:
kind: virtual
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index 46a68f76a4d898c00e04f3caf448a9d21cd67029..eba2e8af7ce85a2489d980e3ac4a2dc19084d93e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -19,11 +19,11 @@ nodes:
temperature:
available: true
via:
- api:
- metric: ambient_temp
+ api:
+ metric: ambient_temp
ipmi:
- sensors:
- ambient: /MB/T_AMB
+ sensors:
+ ambient: /MB/T_AMB
processor:
microarchitecture: Nehalem
clock_speed: 2950000000
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index 07e0eeccae60f2f03e05023755f030190fcda8dc..f686549905ae814ba69aac67d6051b4961554750 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -74,10 +74,10 @@ nodes:
available: true
via:
api:
- metric: ambient_temp
+ metric: ambient_temp
ipmi:
- sensors:
- ambient: Inlet Ambient
+ sensors:
+ ambient: Inlet Ambient
parapluie-10:
status: retired
diff --git a/lib/refrepo/valid/input/schemas/schema-node.yaml b/lib/refrepo/valid/input/schemas/schema-node.yaml
index 5505094e23b65aa733bd0a94616b6fcceb83b8ce..cfe38e2fac63479a253dbdd8577ff10d288e6ef0 100644
--- a/lib/refrepo/valid/input/schemas/schema-node.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-node.yaml
@@ -109,7 +109,7 @@ storage_devices:
unstable_device_name: optional_boolean
interface: string
symlink: optional_string
- storage:
+ storage:
- SSD
- HDD
model: string