diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json
index e108804f93085368dfab8e8c0d799b220ad02848..69138d3e1635298ed40eb4da8709c25b3551d47c 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json
@@ -202,6 +202,11 @@
{
"port": 24,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 0,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-10.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-10.json
index 3ecab99803c938c750ce899362f5f1eb842ed099..574a9291edcf0f9647db9199143da1cac2602409 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-10.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-10.json
@@ -202,6 +202,11 @@
{
"port": 21,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 21,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-11.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-11.json
index b086b581c99ea6b68cfb5d9a8e387cde5055ad78..aff56e8041ae8168d4485e628c0bc0da1239792b 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-11.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-11.json
@@ -202,6 +202,11 @@
{
"port": 20,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 22,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.json
index c99ac139d1a8ebba6d763f5a101db913dd063b77..261c542b3be1121dcd7d324673c4b091e8ecceb3 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.json
@@ -202,6 +202,11 @@
{
"port": 18,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 23,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-13.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-13.json
index 55e0c537a655bf35bfe27d0ea53473e164d57fa7..d00e33834aae17bc5eca944d646a9dd10403c900 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-13.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-13.json
@@ -202,6 +202,11 @@
{
"port": 18,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 30,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-14.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-14.json
index 73a4e77f5c6140656acbe1745352a580a6241a61..dc6ca4e684e31185ab908de8f2fa75433b6a9ccb 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-14.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-14.json
@@ -202,6 +202,11 @@
{
"port": 17,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 31,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-15.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-15.json
index 98a124ee8fa2591f628e94175d9f3a3b3cf2067c..9c45d908a16222452818ed87c475ffd0cdc70cdf 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-15.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-15.json
@@ -202,6 +202,11 @@
{
"port": 16,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 32,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-16.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-16.json
index 4904d9feb214959068ca467d9f48a842eec539c9..9b29ea258918d90513561ecec9e3c8f891b59f5d 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-16.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-16.json
@@ -202,6 +202,11 @@
{
"port": 15,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 33,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-17.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-17.json
index a1f3c0bddbad02454e60d32e46042e54c696f894..42b0b399bbee8789164c6af992fb23ef93f41319 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-17.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-17.json
@@ -202,6 +202,11 @@
{
"port": 14,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 34,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-18.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-18.json
index 001a3770fc3df64700143165b4d260eb72c3adef..d25f3dc6e1dee6bf3db8ee0a6ccaffd9f882a465 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-18.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-18.json
@@ -202,6 +202,11 @@
{
"port": 12,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 35,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-19.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-19.json
index 901f5a8523a7d30c076081f1e719707b6b1800c4..9b86c94001088561991552fff5d81e185e438c1f 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-19.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-19.json
@@ -202,6 +202,11 @@
{
"port": 12,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 24,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json
index c9a8938604fb00cc0919c844f1b67a34133821de..22edd7042f516bd77d04810be4f4fba25ec5b2c0 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json
@@ -202,6 +202,11 @@
{
"port": 23,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 1,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-20.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-20.json
index c4e1eaa5b7985c357464aa17629edf486c9627b3..e327d393325da37007d675e8505621073e43e3cc 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-20.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-20.json
@@ -202,6 +202,11 @@
{
"port": 11,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 25,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-21.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-21.json
index b59423ad443ea30cb946725c80995450def17943..d1f33b607b11394b522b387397b4afe5aa03b59a 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-21.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-21.json
@@ -202,6 +202,11 @@
{
"port": 10,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 26,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-22.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-22.json
index 4e3d7794ed13c7049f029c519ef8782029ec0a1b..4f08b11704c19b3d5e55d2dfd3e24070c04467f3 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-22.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-22.json
@@ -202,6 +202,11 @@
{
"port": 9,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 27,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-23.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-23.json
index afa15d08bb24aa6aac11efbada0a7972ede5f674..bc955eb9fc0814fb8fc71d1e6d590916c9a8dc72 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-23.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-23.json
@@ -202,6 +202,11 @@
{
"port": 8,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 28,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-24.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-24.json
index 92a3445e2dce66a527b8c8776cb5fc805594f4eb..8a3d77b6422b43bdcb715cec8d93213472c9cbf0 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-24.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-24.json
@@ -202,6 +202,11 @@
{
"port": 6,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 29,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json
index 41ded34465887c03c46f00cb5dd78364c828f239..5bc96566b8838102e5700e10f7ef7207cbe2e02b 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json
@@ -202,6 +202,11 @@
{
"port": 5,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 6,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json
index 413e43e170a0e8137422606afa1c28f9a0d36d0b..1553ff70c07d0a0300a4ebc3b26791dec903e3e1 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json
@@ -202,6 +202,11 @@
{
"port": 4,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 7,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json
index 5e156db9c482b9eab0c6c3a8bad3d911bd702783..dd0aa2f74e4cd555db407f00a1c1a4a2913cc20f 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json
@@ -202,6 +202,11 @@
{
"port": 5,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 8,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json
index 155d9a9d6e03f9048d3dde0c8a7524289e030fee..0497084f65aa08fdce6b75df8828b4bec37e0f49 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json
@@ -202,6 +202,11 @@
{
"port": 4,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 9,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json
index 90527bfbf595568b0100820efac486845ace6886..35ed35fbcfcd9b1e6c9e3b5d1d42a08b3af412f1 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json
@@ -202,6 +202,11 @@
{
"port": 5,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 10,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json
index cd388d936705844220bfed249f29ff185e41fa6c..f623f9b80b66fd866e62dcf7ce817bedd6ca7b67 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json
@@ -202,6 +202,11 @@
{
"port": 22,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 2,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json
index 88fc656dfb713e4ccaed81e2492f14d02f528188..46269d7e1537f41a89e5ce291c11320762563bc9 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json
@@ -202,6 +202,11 @@
{
"port": 4,
"uid": "paradoxe-pdu3"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 11,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
index 6d3e045818e62c4f602d0a50f3f244ade460bcbd..755cc68d477346bb22ba8f86f5a18cd855e0c8c5 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
@@ -202,6 +202,11 @@
{
"port": 5,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 12,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
index b9a61045128712d30a1a65d4732502a69f9bc815..97434c4a2233aea8e868492d704edf0f7ba9189e 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
@@ -202,6 +202,11 @@
{
"port": 4,
"uid": "paradoxe-pdu4"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 13,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json
index 54651b1faf76184855e02102d42c92889f9910f6..f2ebbb8ccb07d96bac38d70e7f536097572ea9da 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json
@@ -202,6 +202,11 @@
{
"port": 21,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 3,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json
index 7bc006ce6d58a4bcf165a6f72bad07b589389be3..e162b1161f0254b91179c0d8c067d72ccd5f5a43 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json
@@ -202,6 +202,11 @@
{
"port": 20,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 4,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json
index 8e0ab7b4e5ac8bdafa5fa4abad0f5ee42526aef6..6da48896a8be32c3a83a5b287b398632eaf3fefd 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json
@@ -202,6 +202,11 @@
{
"port": 18,
"uid": "paradoxe-pdu1"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 5,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-7.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-7.json
index ff338b0d08e01ccf36436416439aab1a55a2755f..bba2dc4506e5180e18d53f7a30624eef34eec50f 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-7.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-7.json
@@ -202,6 +202,11 @@
{
"port": 24,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 18,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-8.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-8.json
index eb5ffc0013f407575b55aeb0f95575f5967bb12c..6cc15d286706781a4442a728af952ce0cdf78b5b 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-8.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-8.json
@@ -202,6 +202,11 @@
{
"port": 23,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 19,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-9.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-9.json
index 968833eb64bfdd15d6a615a4c7e8051e91bad0be..95740474c013d3aa417c43ba8716d3d910bdf841 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-9.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-9.json
@@ -202,6 +202,11 @@
{
"port": 22,
"uid": "paradoxe-pdu2"
+ },
+ {
+ "kind": "wattmetre-only",
+ "port": 20,
+ "uid": "wattmetrev3-1"
}
],
"performance": {
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
index 1300ad94c5a8a6e509d27faf7223535336d20c97..eeb85871b7f8e15285429250794362f4e86ea9b0 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
@@ -5,6 +5,15 @@
"kavlan": true,
"manufactured_at": "2023-05-27",
"metrics": [
+ {
+ "description": "Power consumption of node reported by wattmetre, in watt",
+ "name": "wattmetre_power_watt",
+ "optional_period": 10,
+ "period": 1000,
+ "source": {
+ "protocol": "wattmetre"
+ }
+ },
{
"description": "Default subset of metrics from Prometheus Node Exporter",
"name": "prom_default_metrics",
diff --git a/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json b/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a30987526f2f2ba6de591e46646229a41f1f34de
--- /dev/null
+++ b/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json
@@ -0,0 +1,54 @@
+{
+ "ip": "172.16.63.8",
+ "kind": "wattmetre-only",
+ "metrics": [
+ {
+ "description": "Power consumption per outlet reported by wattmetre, in watt",
+ "name": "wattmetre_power_watt",
+ "optional_period": 10,
+ "period": 1000,
+ "source": {
+ "protocol": "wattmetre"
+ }
+ }
+ ],
+ "model": "v3",
+ "ports": {
+ "0": "paradoxe-1",
+ "1": "paradoxe-2",
+ "10": "paradoxe-29",
+ "11": "paradoxe-30",
+ "12": "paradoxe-31",
+ "13": "paradoxe-32",
+ "18": "paradoxe-7",
+ "19": "paradoxe-8",
+ "2": "paradoxe-3",
+ "20": "paradoxe-9",
+ "21": "paradoxe-10",
+ "22": "paradoxe-11",
+ "23": "paradoxe-12",
+ "24": "paradoxe-19",
+ "25": "paradoxe-20",
+ "26": "paradoxe-21",
+ "27": "paradoxe-22",
+ "28": "paradoxe-23",
+ "29": "paradoxe-24",
+ "3": "paradoxe-4",
+ "30": "paradoxe-13",
+ "31": "paradoxe-14",
+ "32": "paradoxe-15",
+ "33": "paradoxe-16",
+ "34": "paradoxe-17",
+ "35": "paradoxe-18",
+ "4": "paradoxe-5",
+ "5": "paradoxe-6",
+ "6": "paradoxe-25",
+ "7": "paradoxe-26",
+ "8": "paradoxe-27",
+ "9": "paradoxe-28"
+ },
+ "serial": "02000361",
+ "type": "pdu",
+ "uid": "wattmetrev3-1",
+ "vendor": "OmegaWatt"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/pve-3.json b/data/grid5000/sites/rennes/servers/pve-3.json
index c90ceb1a8f16ab32db83791f9c16e83c25d7a0bf..71284836a119dcdf9787806de8663a2afc9bfa87 100644
--- a/data/grid5000/sites/rennes/servers/pve-3.json
+++ b/data/grid5000/sites/rennes/servers/pve-3.json
@@ -1,6 +1,6 @@
{
"alias": [
-
+ "wattmetre"
],
"kind": "physical",
"network_adapters": {
diff --git a/input/grid5000/sites/rennes/clusters/paradoxe/paradoxe_pdu.yaml b/input/grid5000/sites/rennes/clusters/paradoxe/paradoxe_pdu.yaml
deleted file mode 100644
index d99fd4dd2419204036b1569634a9e57992d08c58..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/paradoxe/paradoxe_pdu.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-nodes:
- paradoxe-1:
- pdu:
- - uid: paradoxe-pdu1
- port: 24
- paradoxe-2:
- pdu:
- - uid: paradoxe-pdu1
- port: 23
- paradoxe-3:
- pdu:
- - uid: paradoxe-pdu1
- port: 22
- paradoxe-4:
- pdu:
- - uid: paradoxe-pdu1
- port: 21
- paradoxe-5:
- pdu:
- - uid: paradoxe-pdu1
- port: 20
- paradoxe-6:
- pdu:
- - uid: paradoxe-pdu1
- port: 18
- paradoxe-7:
- pdu:
- - uid: paradoxe-pdu2
- port: 24
- paradoxe-8:
- pdu:
- - uid: paradoxe-pdu2
- port: 23
- paradoxe-9:
- pdu:
- - uid: paradoxe-pdu2
- port: 22
- paradoxe-10:
- pdu:
- - uid: paradoxe-pdu2
- port: 21
- paradoxe-11:
- pdu:
- - uid: paradoxe-pdu2
- port: 20
- paradoxe-12:
- pdu:
- - uid: paradoxe-pdu2
- port: 18
- paradoxe-13:
- pdu:
- - uid: paradoxe-pdu3
- port: 18
- paradoxe-14:
- pdu:
- - uid: paradoxe-pdu3
- port: 17
- paradoxe-15:
- pdu:
- - uid: paradoxe-pdu3
- port: 16
- paradoxe-16:
- pdu:
- - uid: paradoxe-pdu3
- port: 15
- paradoxe-17:
- pdu:
- - uid: paradoxe-pdu3
- port: 14
- paradoxe-18:
- pdu:
- - uid: paradoxe-pdu3
- port: 12
- paradoxe-19:
- pdu:
- - uid: paradoxe-pdu4
- port: 12
- paradoxe-20:
- pdu:
- - uid: paradoxe-pdu4
- port: 11
- paradoxe-21:
- pdu:
- - uid: paradoxe-pdu4
- port: 10
- paradoxe-22:
- pdu:
- - uid: paradoxe-pdu4
- port: 9
- paradoxe-23:
- pdu:
- - uid: paradoxe-pdu4
- port: 8
- paradoxe-24:
- pdu:
- - uid: paradoxe-pdu4
- port: 6
- paradoxe-25:
- pdu:
- - uid: paradoxe-pdu1
- port: 5
- paradoxe-26:
- pdu:
- - uid: paradoxe-pdu1
- port: 4
- paradoxe-27:
- pdu:
- - uid: paradoxe-pdu2
- port: 5
- paradoxe-28:
- pdu:
- - uid: paradoxe-pdu2
- port: 4
- paradoxe-29:
- pdu:
- - uid: paradoxe-pdu3
- port: 5
- paradoxe-30:
- pdu:
- - uid: paradoxe-pdu3
- port: 4
- paradoxe-31:
- pdu:
- - uid: paradoxe-pdu4
- port: 5
- paradoxe-32:
- pdu:
- - uid: paradoxe-pdu4
- port: 4
diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml
index 631c82daf4433a2c66a8920710740ebe0e24986a..96399bc2eb769e42649912fd2de11466b422f0c4 100644
--- a/input/grid5000/sites/rennes/pdus.yaml
+++ b/input/grid5000/sites/rennes/pdus.yaml
@@ -76,12 +76,254 @@ pdus:
paradoxe-pdu1:
ip: 172.17.101.201
mac: 00:0D:5D:2B:75:A4
+ ports:
+ 24:
+ uid: paradoxe-1
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 23:
+ uid: paradoxe-2
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 2
+ phase: 1
+ phase_inverted: false
+ 22:
+ uid: paradoxe-3
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 3
+ phase: 1
+ phase_inverted: false
+ 21:
+ uid: paradoxe-4
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 4
+ phase: 1
+ phase_inverted: false
+ 20:
+ uid: paradoxe-5
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 5
+ phase: 1
+ phase_inverted: false
+ 18:
+ uid: paradoxe-6
+ wattmetre: wattmetrev3-1
+ module: '04000599'
+ channel: 6
+ phase: 1
+ phase_inverted: false
+ 5:
+ uid: paradoxe-25
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 4:
+ uid: paradoxe-26
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 2
+ phase: 1
+ phase_inverted: false
paradoxe-pdu2:
ip: 172.17.101.202
mac: 00:0D:5D:2C:DA:F2
+ ports:
+ 24:
+ uid: paradoxe-7
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 23:
+ uid: paradoxe-8
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 2
+ phase: 1
+ phase_inverted: false
+ 22:
+ uid: paradoxe-9
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 3
+ phase: 1
+ phase_inverted: false
+ 21:
+ uid: paradoxe-10
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 4
+ phase: 1
+ phase_inverted: false
+ 20:
+ uid: paradoxe-11
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 5
+ phase: 1
+ phase_inverted: false
+ 18:
+ uid: paradoxe-12
+ wattmetre: wattmetrev3-1
+ module: '04000603'
+ channel: 6
+ phase: 1
+ phase_inverted: false
+ 5:
+ uid: paradoxe-27
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 3
+ phase: 1
+ phase_inverted: false
+ 4:
+ uid: paradoxe-28
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 4
+ phase: 1
+ phase_inverted: false
paradoxe-pdu3:
ip: 172.17.101.203
mac: 00:0D:5D:2B:75:AC
+ ports:
+ 18:
+ uid: paradoxe-13
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 17:
+ uid: paradoxe-14
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 2
+ phase: 1
+ phase_inverted: false
+ 16:
+ uid: paradoxe-15
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 3
+ phase: 1
+ phase_inverted: false
+ 15:
+ uid: paradoxe-16
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 4
+ phase: 1
+ phase_inverted: false
+ 14:
+ uid: paradoxe-17
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 5
+ phase: 1
+ phase_inverted: false
+ 12:
+ uid: paradoxe-18
+ wattmetre: wattmetrev3-1
+ module: '04000606'
+ channel: 6
+ phase: 1
+ phase_inverted: false
+ 5:
+ uid: paradoxe-29
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 5
+ phase: 1
+ phase_inverted: false
+ 4:
+ uid: paradoxe-30
+ wattmetre: wattmetrev3-1
+ module: '04000600'
+ channel: 6
+ phase: 1
+ phase_inverted: false
paradoxe-pdu4:
ip: 172.17.101.204
mac: 00:0D:5D:2C:DA:F0
+ ports:
+ 12:
+ uid: paradoxe-19
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 11:
+ uid: paradoxe-20
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 2
+ phase: 1
+ phase_inverted: false
+ 10:
+ uid: paradoxe-21
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 3
+ phase: 1
+ phase_inverted: false
+ 9:
+ uid: paradoxe-22
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 4
+ phase: 1
+ phase_inverted: false
+ 8:
+ uid: paradoxe-23
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 5
+ phase: 1
+ phase_inverted: false
+ 6:
+ uid: paradoxe-24
+ wattmetre: wattmetrev3-1
+ module: '04000604'
+ channel: 6
+ phase: 1
+ phase_inverted: false
+ 5:
+ uid: paradoxe-31
+ wattmetre: wattmetrev3-1
+ module: '04000601'
+ channel: 1
+ phase: 1
+ phase_inverted: false
+ 4:
+ uid: paradoxe-32
+ wattmetre: wattmetrev3-1
+ module: '04000601'
+ channel: 2
+ phase: 1
+ phase_inverted: false
+
+ wattmetrev3-1:
+ vendor: OmegaWatt
+ model: v3
+ kind: wattmetre-only
+ serial: '02000361'
+ 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
+ source:
+ protocol: wattmetre
diff --git a/input/grid5000/sites/rennes/servers/physical.yaml b/input/grid5000/sites/rennes/servers/physical.yaml
index a5eadcd9b014817da219beca332f093993dd2fb2..dfd7231ce737d285835e04d8193a0682f6d94780 100644
--- a/input/grid5000/sites/rennes/servers/physical.yaml
+++ b/input/grid5000/sites/rennes/servers/physical.yaml
@@ -174,7 +174,7 @@ pve-2:
pve-3:
kind: physical
- alias: []
+ alias: [wattmetre]
warranty: 2030-15
serial: CZJ3151FJS
network_adapters: