From 60c5fe7ba9891b3b23b277b7882ee90785a96be7 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Thu, 17 Feb 2022 15:27:34 +0100
Subject: [PATCH] [lyon] Update nova, taurus, orion wattmetre mapping
---
.../lyon/clusters/nova/nodes/nova-1.json | 6 ++
.../lyon/clusters/nova/nodes/nova-10.json | 6 ++
.../lyon/clusters/nova/nodes/nova-11.json | 6 ++
.../lyon/clusters/nova/nodes/nova-12.json | 6 ++
.../lyon/clusters/nova/nodes/nova-13.json | 6 ++
.../lyon/clusters/nova/nodes/nova-14.json | 6 ++
.../lyon/clusters/nova/nodes/nova-15.json | 6 ++
.../lyon/clusters/nova/nodes/nova-16.json | 6 ++
.../lyon/clusters/nova/nodes/nova-17.json | 6 ++
.../lyon/clusters/nova/nodes/nova-18.json | 6 ++
.../lyon/clusters/nova/nodes/nova-19.json | 6 ++
.../lyon/clusters/nova/nodes/nova-2.json | 6 ++
.../lyon/clusters/nova/nodes/nova-20.json | 6 ++
.../lyon/clusters/nova/nodes/nova-21.json | 6 ++
.../lyon/clusters/nova/nodes/nova-22.json | 6 ++
.../lyon/clusters/nova/nodes/nova-23.json | 6 ++
.../lyon/clusters/nova/nodes/nova-3.json | 6 ++
.../lyon/clusters/nova/nodes/nova-4.json | 6 ++
.../lyon/clusters/nova/nodes/nova-5.json | 6 ++
.../lyon/clusters/nova/nodes/nova-6.json | 6 ++
.../lyon/clusters/nova/nodes/nova-7.json | 6 ++
.../lyon/clusters/nova/nodes/nova-8.json | 6 ++
.../lyon/clusters/nova/nodes/nova-9.json | 6 ++
.../sites/lyon/clusters/nova/nova.json | 9 +++
.../lyon/clusters/orion/nodes/orion-1.json | 4 +-
.../lyon/clusters/orion/nodes/orion-3.json | 4 +-
.../lyon/clusters/orion/nodes/orion-4.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-1.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-10.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-11.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-12.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-13.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-15.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-3.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-4.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-5.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-6.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-7.json | 2 +-
.../lyon/clusters/taurus/nodes/taurus-8.json | 4 +-
.../lyon/clusters/taurus/nodes/taurus-9.json | 4 +-
data/grid5000/sites/lyon/pdus/wattmetre1.json | 44 +++++++++++
data/grid5000/sites/lyon/pdus/wattmetre4.json | 36 ---------
.../lyon/clusters/orion/orion_pdu.yaml.erb | 8 --
.../lyon/clusters/taurus/taurus_pdu.yaml.erb | 8 --
input/grid5000/sites/lyon/pdus.yaml | 75 +++++++++++++------
45 files changed, 270 insertions(+), 100 deletions(-)
delete mode 100644 data/grid5000/sites/lyon/pdus/wattmetre4.json
delete mode 100644 input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml.erb
delete mode 100644 input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml.erb
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
index c3c2a54714e..062df0e0e7c 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 7,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
index 1594f1dec1c..10aeee1296b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 16,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
index 7604d959f6a..8730d6b7ace 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 17,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
index 8c0f00583bd..d1c2db85230 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 18,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
index ef09798d438..7ed8eb4de8b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 19,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
index 4cf2b351b48..ed05153243f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 20,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
index ad1b8d80a6e..1dc4e58d6f5 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 21,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
index 332e90f7ad4..034402b57f4 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 22,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
index d3ebadfe664..670a6dd082b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 23,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
index 090f64f2f66..dbc85e2d169 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 24,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
index c36d09b832d..68e5a5c6422 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 25,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
index d32f45922e7..818bb0f9935 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 8,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
index 6a37140dbd6..ad24d2c7ecf 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 26,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
index 5b0ca3ea617..e2c92122aee 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 27,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
index 22b984fde72..c0003faea8d 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 28,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
index f341c9f3785..f8eaf8f5220 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 29,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
index beb4160ea4b..dd6c192e7f9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 9,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
index 78a4d4c147a..013b4b16518 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 10,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
index d045eee787c..0d2a6fec2fd 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 11,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
index 5ff81f0ce38..60d48e934d2 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 12,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
index 1e81f04e848..660d8e56661 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 13,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
index aadb0e0a661..7b057231933 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 14,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
index f22147f3ad9..40755f55ad6 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
@@ -228,6 +228,12 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
+ "pdu": [
+ {
+ "port": 15,
+ "uid": "wattmetre1"
+ }
+ ],
"performance": {
"core_flops": 33600000000,
"node_flops": 537600000000
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 43d0453f72b..952d5ad7361 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -4,6 +4,15 @@
"exotic": false,
"kavlan": true,
"metrics": [
+ {
+ "description": "Power consumption of node reported by wattmetre, in watt",
+ "name": "wattmetre_power_watt",
+ "optional_period": 20,
+ "period": 1000,
+ "source": {
+ "protocol": "wattmetre"
+ }
+ },
{
"description": "Front node ambient temperature reported by BMC, in celsius",
"name": "bmc_ambient_temp_celsius",
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
index ca221a05bd6..e6468f05f3d 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
@@ -263,8 +263,8 @@
},
"pdu": [
{
- "port": 16,
- "uid": "wattmetre4"
+ "port": 39,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
index ebbe15960c5..10701577819 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
@@ -263,8 +263,8 @@
},
"pdu": [
{
- "port": 18,
- "uid": "wattmetre4"
+ "port": 40,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
index e7df6d0be45..0c5d3a39f5e 100644
--- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
+++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
@@ -263,8 +263,8 @@
},
"pdu": [
{
- "port": 19,
- "uid": "wattmetre4"
+ "port": 41,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
index 2285f74bb44..b823b85a74b 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 0,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
index 32cd0fcacdf..fbefe2606a0 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 9,
- "uid": "wattmetre4"
+ "port": 32,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
index a0d5a7524c3..f883aa9cb78 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 10,
- "uid": "wattmetre4"
+ "port": 33,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
index 54e920a17df..60f063a1bda 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 11,
- "uid": "wattmetre4"
+ "port": 34,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
index 34a1446aa86..9c624b0cb05 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 12,
- "uid": "wattmetre4"
+ "port": 35,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
index b0e43b4b336..38f548056f1 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 14,
- "uid": "wattmetre4"
+ "port": 37,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
index 22768ca8c1e..235fa03c40a 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 2,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
index 9f0c2e047be..497b78d687f 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 3,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
index 450f5a09ec4..8581b145d13 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 4,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
index 274f8a4d0a4..d5100e50df5 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 5,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
index 9bfc4f48e89..fd92ee0ddf4 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json
@@ -251,7 +251,7 @@
"pdu": [
{
"port": 6,
- "uid": "wattmetre4"
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
index 138ced2d8df..c8ebc7178d9 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 7,
- "uid": "wattmetre4"
+ "port": 30,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
index 5e4a39c5079..a506b5d1639 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json
@@ -250,8 +250,8 @@
},
"pdu": [
{
- "port": 8,
- "uid": "wattmetre4"
+ "port": 31,
+ "uid": "wattmetre1"
}
],
"performance": {
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index a1d9ae3dfda..702ae9d269f 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -12,6 +12,50 @@
}
],
"model": "v2",
+ "ports": {
+ "0": "taurus-1",
+ "1": "taurus-2",
+ "10": "nova-4",
+ "11": "nova-5",
+ "12": "nova-6",
+ "13": "nova-7",
+ "14": "nova-8",
+ "15": "nova-9",
+ "16": "nova-10",
+ "17": "nova-11",
+ "18": "nova-12",
+ "19": "nova-13",
+ "2": "taurus-3",
+ "20": "nova-14",
+ "21": "nova-15",
+ "22": "nova-16",
+ "23": "nova-17",
+ "24": "nova-18",
+ "25": "nova-19",
+ "26": "nova-20",
+ "27": "nova-21",
+ "28": "nova-22",
+ "29": "nova-23",
+ "3": "taurus-4",
+ "30": "taurus-8",
+ "31": "taurus-9",
+ "32": "taurus-10",
+ "33": "taurus-11",
+ "34": "taurus-12",
+ "35": "taurus-13",
+ "36": "taurus-14",
+ "37": "taurus-15",
+ "38": "taurus-16",
+ "39": "orion-1",
+ "4": "taurus-5",
+ "40": "orion-3",
+ "41": "orion-4",
+ "5": "taurus-6",
+ "6": "taurus-7",
+ "7": "nova-1",
+ "8": "nova-2",
+ "9": "nova-3"
+ },
"type": "pdu",
"uid": "wattmetre1",
"vendor": "OmegaWatt"
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre4.json b/data/grid5000/sites/lyon/pdus/wattmetre4.json
deleted file mode 100644
index 5234182a969..00000000000
--- a/data/grid5000/sites/lyon/pdus/wattmetre4.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "ip": "172.16.63.8",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by wattmetre, in watt",
- "name": "wattmetre_power_watt",
- "optional_period": 20,
- "period": 1000,
- "source": {
- "protocol": "wattmetre"
- }
- }
- ],
- "model": "v2",
- "ports": {
- "0": "taurus-1",
- "10": "taurus-11",
- "11": "taurus-12",
- "12": "taurus-13",
- "14": "taurus-15",
- "16": "orion-1",
- "18": "orion-3",
- "19": "orion-4",
- "2": "taurus-3",
- "3": "taurus-4",
- "4": "taurus-5",
- "5": "taurus-6",
- "6": "taurus-7",
- "7": "taurus-8",
- "8": "taurus-9",
- "9": "taurus-10"
- },
- "type": "pdu",
- "uid": "wattmetre4",
- "vendor": "OmegaWatt"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml.erb b/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml.erb
deleted file mode 100644
index 25c28180e6f..00000000000
--- a/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml.erb
+++ /dev/null
@@ -1,8 +0,0 @@
----
-nodes:
-<% (1..4).each { |i| %>
- orion-<%= i %>:
- pdu:
- - uid: wattmetre4
- port: <%= i+15 %>
-<% } %>
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml.erb b/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml.erb
deleted file mode 100644
index 41fabffc44b..00000000000
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml.erb
+++ /dev/null
@@ -1,8 +0,0 @@
----
-nodes:
-<% (1..16).each { |i| %>
- taurus-<%= i %>:
- pdu:
- - uid: wattmetre4
- port: <%= i-1 %>
-<% } %>
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index 521a50bd436..b8a3808a85a 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -406,25 +406,66 @@ pdus:
phase: 1 ## pas 2 ?
phase_inverted: false # ??
- wattmetrev3-1:
+ wattmetre1:
vendor: OmegaWatt
- model: v3
- kind: wattmetre-only
- serial: '02000014'
+ model: v2
ip: 172.16.63.8
metrics:
- name: wattmetre_power_watt
description: Power consumption per outlet reported by wattmetre, in watt
period: 1000
- optional_period: 10
+ optional_period: 20
source:
protocol: wattmetre
+ ports:
+ 0: taurus-1
+ 1: taurus-2
+ 2: taurus-3
+ 3: taurus-4
+ 4: taurus-5
+ 5: taurus-6
+ 6: taurus-7
+ 7: nova-1
+ 8: nova-2
+ 9: nova-3
+ 10: nova-4
+ 11: nova-5
+ 12: nova-6
+ 13: nova-7
+ 14: nova-8
+ 15: nova-9
+ 16: nova-10
+ 17: nova-11
+ 18: nova-12
+ 19: nova-13
+ 20: nova-14
+ 21: nova-15
+ 22: nova-16
+ 23: nova-17
+ 24: nova-18
+ 25: nova-19
+ 26: nova-20
+ 27: nova-21
+ 28: nova-22
+ 29: nova-23
+ 30: taurus-8
+ 31: taurus-9
+ 32: taurus-10
+ 33: taurus-11
+ 34: taurus-12
+ 35: taurus-13
+ 36: taurus-14
+ 37: taurus-15
+ 38: taurus-16
+ 39: orion-1
+ 40: orion-3 #orion-2 est retired, on passe direct à orion-3
+ 41: orion-4
- wattmetrev3-2:
+ wattmetrev3-1:
vendor: OmegaWatt
model: v3
kind: wattmetre-only
- serial: '02000011'
+ serial: '02000014'
ip: 172.16.63.8
metrics:
- name: wattmetre_power_watt
@@ -434,26 +475,16 @@ pdus:
source:
protocol: wattmetre
- wattmetre1:
- vendor: OmegaWatt
- model: v2
- ip: 172.16.63.8
- metrics:
- - name: wattmetre_power_watt
- description: Power consumption per outlet reported by wattmetre, in watt
- period: 1000
- optional_period: 20
- source:
- protocol: wattmetre
-
- wattmetre4:
+ wattmetrev3-2:
vendor: OmegaWatt
- model: v2
+ model: v3
+ kind: wattmetre-only
+ serial: '02000011'
ip: 172.16.63.8
metrics:
- name: wattmetre_power_watt
description: Power consumption per outlet reported by wattmetre, in watt
period: 1000
- optional_period: 20
+ optional_period: 10
source:
protocol: wattmetre
--
GitLab