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 c3c2a54714eeb2ae6ac4dc46779035a751742152..062df0e0e7c18d97ba17ff3b21b80976c07363e1 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 1594f1dec1c12d06f563f82e163595fca192a148..10aeee1296ba8907dc632d1443d5ef2a95987a14 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 7604d959f6a1d55bb7179549fdb6ac5f50e7547e..8730d6b7acef13b74d574fe4c82790494d92ccbf 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 8c0f00583bd78e6774259a7581f021b27fb8ed69..d1c2db852302ce01b5394f5713defabee925595e 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 ef09798d438b9b7a83e75b870b236c1312b9e592..7ed8eb4de8bb728df3d9446ce86fbe9f469d7067 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 4cf2b351b48873595daece6e0c0d758f601a51c9..ed05153243f24423c0a17e44af4c1e93e4781379 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 ad1b8d80a6e647412509b6ba08f27b38d31e8d80..1dc4e58d6f55a0d9237ac89afe787fe53d996054 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 332e90f7ad4a220aada2d798a95d09cbc598b5ea..034402b57f43e5538bf94ee0d75d51d0895e5b54 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 d3ebadfe664c27abb054887f185a64aef58acc8e..670a6dd082b32d1c0637e939b869851640652654 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 090f64f2f6660fbc9d8f5139951ad33a09833688..dbc85e2d1699131f6b0c13101d78a30b4d4fc9a3 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 c36d09b832db4d25795d4666daf4e01197060b6b..68e5a5c6422b94df8f719a2a9314dec3091a2e7c 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 d32f45922e7106b9ac795b7872f2dab493884464..818bb0f9935e4e1d32739b3623f2dc00dd671b6c 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 6a37140dbd6218a02a8bb596bea2d04e07874e03..ad24d2c7ecf66a4ccc1d2df96ceb6c35898c1d94 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 5b0ca3ea6175163194614c307c513fef951c8f22..e2c92122aee9f555cc8bb3b98d23aa34eb386a6a 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 22b984fde727af5cc6f0b672ead02dd5f52a8827..c0003faea8dd2548b324ec8c57cf8c89a738831a 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 f341c9f3785337785ca2dd3e01782b9108448f25..f8eaf8f52203f074d33ab765458278654f862d95 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 beb4160ea4b8f90748b6f6e29fde3297d0ec330c..dd6c192e7f96f8a39ce5984d67e724c0f33f493a 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 78a4d4c147a0595fba8fa166e9a0346169f07864..013b4b1651850cb2479668d000e5975a953c6f68 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 d045eee787cacccd46e59268f36f0347400b94a0..0d2a6fec2fd326d214cc2a578dc3c731b57cb158 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 5ff81f0ce387876a8ce2b8012b58a41a2deaaa09..60d48e934d2f9df1efb15423f6824df105a9cba7 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 1e81f04e84816e3bcf9c0c23de93337d22b0ed13..660d8e5666128577fdf29581be0dbf5472190d81 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 aadb0e0a6613b2def83a1d06cad616f5c921f20a..7b05723193314114197111e5fcec82d2462d051c 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 f22147f3ad9e93e4ad5c6f9c0387aace61e81cf9..40755f55ad6f94cad3a70f90d84ba826bbd67e81 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 43d0453f72ba899e866e24f8e7a1292ac08236eb..952d5ad7361b84b894eedd64b1e58418694dac2c 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 ca221a05bd633e50a49ad8e2ff2de81e139f16ec..e6468f05f3dc673067501d719b10b1d034892016 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 ebbe15960c5ca6b5efe7ba3d556103a3e4e1988f..10701577819bd2140b2401c0af413b7992360036 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 e7df6d0be4596869f69681791f51e1770c29cc0b..0c5d3a39f5e2fbb2f3e079279440555f67b8b595 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 2285f74bb444ef6313edd4f83cb5ceb4ce366872..b823b85a74bb8a94110b875ae494c6eb88f635b7 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 32cd0fcacdf6aacdca59828c6c54c8f67ada15ba..fbefe2606a0114e603ba5618e19316eb97e8f2e0 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 a0d5a7524c30d278c62cfddc928a11096235bb6f..f883aa9cb78c3c60cd51a7a542d16d49c30e57dc 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 54e920a17dfed6a5ee0f935b725cb1ed5d31c682..60f063a1bdae9ca7b7ef811433262e784fec768f 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 34a1446aa861859e57f4d891ca182b34f1005b6b..9c624b0cb0588764fbb6cac8f456d3b34b88f297 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 b0e43b4b336bc8338a152b235361ddeb1e75967f..38f548056f12036b26ce48b3864250f8c862ed81 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 22768ca8c1e6aad189b4170e51bd6dbf751faca4..235fa03c40ad05702ffd934d9b30aba60f5aa9dd 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 9f0c2e047be02fb006ff17642995594e3d32de28..497b78d687f3cac69e26686061534597c49ed404 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 450f5a09ec4d94af7027a6e9a2e11f29be654d27..8581b145d13749eecc4bce0b451a3522a2d72bd1 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 274f8a4d0a4bf755c050a6218c1e796f4ff3f469..d5100e50df5e2808859f8b5293c000286aa36a00 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 9bfc4f48e89ca75b6ab5907b32d20407189ea8e7..fd92ee0ddf480dd595029cd2b011e84817859f68 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 138ced2d8dff59d82154c4fdf6dbce6bd63d1ba2..c8ebc7178d9217c65ce16cac107d66b656ecb13b 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 5e4a39c5079bd77d5ee0574cdf8100cfe472c3b0..a506b5d1639b3005eafc24b5459ecc6b7e6c758a 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 a1d9ae3dfda9ef29bffc43a040331714bc007d7f..702ae9d269fef15719ac2d8b24b3e563f6cc3eea 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 5234182a969193b0e79722a98afed257431b5dce..0000000000000000000000000000000000000000
--- 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 25c28180e6fc5af43bdad5232bb567b2bb3ae870..0000000000000000000000000000000000000000
--- 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 41fabffc44b9fb7ea5e5fa64bbdc70df2b28dc8d..0000000000000000000000000000000000000000
--- 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 521a50bd436808052d30ac22a09eb388e63d3809..b8a3808a85ad8061e0eb93717c992ef79f3fd298 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