diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json index 2d1bd8c9ace615b12f90c5b487eb967464f92162..20cdf8bcda548885dc033011cb5b5ff6d1c381fc 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 0, - "uid": "gros-wattmetre1" - }, { "port": 1, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json index 95d23bcafea06f6e6ad98b5739a6b0576e4a215f..41744c4615ad1da8b78015897c70f94fd9781830 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 9, - "uid": "gros-wattmetre1" - }, { "port": 6, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json index 34665f4cdb6aa0d923bfd3115c4c4775f21cc5c1..0c42539d56f0cf156d65125fd6987117b295f9c0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 29, - "uid": "gros-wattmetre3" - }, { "port": 14, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json index 28eaed219c00aecec645e5aae63118e151182093..993e170b0d4f3cf86a0167758a415bb1f8d4c98d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 18, - "uid": "gros-wattmetre3" - }, { "port": 14, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json index ae1b2585449e0b82f402a26783e1bb61c55cf965..9a70f188ef8b03a6803b95317f7f7e8e0b7d3f9f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 19, - "uid": "gros-wattmetre3" - }, { "port": 15, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json index 253214090a4592247f991165ba9f008e514b3a43..5f9cd55fe1b140cf604745609d69113a564a9010 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 20, - "uid": "gros-wattmetre3" - }, { "port": 17, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json index d6d7895d3b4ccdbaa280fe43380d68f521a64de3..0defaba0aa8121a272b8c81732bfb653f79cc4c6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 21, - "uid": "gros-wattmetre3" - }, { "port": 15, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json index d15073cb4bd34e2433782bbdf1ac53fcbf97250c..4c408c7567c916a9993bb9fb9909b0460b35b6f4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 22, - "uid": "gros-wattmetre3" - }, { "port": 17, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json index b9e27e3f9a6bf3a9dbb8c0800fc7c3bfd0828a04..71919eaa121f6d0bb67ad098b2489c1e8a535201 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 23, - "uid": "gros-wattmetre3" - }, { "port": 18, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json index 1fd52cb9a6e865dc872979b3e567c607dc848a37..38aebc73ba95a4a3c1ae5e45271c7c1ac276518f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 12, - "uid": "gros-wattmetre3" - }, { "port": 19, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json index ee41824325f245dc81de3138be14e4ad92ade2e1..28ac5a9088fc5aa9c43fb75678e7b8a1bdd4a43a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 13, - "uid": "gros-wattmetre3" - }, { "port": 18, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json index 871891d02465c80932aa1d74f1bec57ab86a6e93..627d896125622df2a7b2f6f1a9e30bdf19dda13b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 14, - "uid": "gros-wattmetre3" - }, { "port": 20, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json index 9d0fc28d6ff60cc1507a2819ee6e141c9cb26d85..4fe92dc7b74386b85ada0c4c07d461fefec8bc51 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 10, - "uid": "gros-wattmetre1" - }, { "port": 6, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json index 85ec94a905c66b7639f39597cd93bd09ddf92f24..1b6b839c1cc8d3867b1cd3840157c2b212a19981 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 15, - "uid": "gros-wattmetre3" - }, { "port": 19, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json index 8259edd47944af97a7ee0ab7948655c7295622b0..23b490767fa7a8abfefe296e845d0edab651746e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 16, - "uid": "gros-wattmetre3" - }, { "port": 20, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json index 5c98674efdbec54e7e1d840aa827a9c32a923b6c..da7b0f32cfddd0a2eeb7da752b59cd0aa12e2ad0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 17, - "uid": "gros-wattmetre3" - }, { "port": 21, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json index d1256c54de65cfcc2b1c708ad3a2f4e92d4a9251..03b3488107328e8a8d321da2bf3a50f7e0ef28e9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 0, - "uid": "gros-wattmetre3" - }, { "port": 22, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json index 90a2d2aea3d59cece58d6fe654a514edc92d0093..4c74b4343022c2a6823fb2074bf6031d4142cbc2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 1, - "uid": "gros-wattmetre3" - }, { "port": 21, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json index 42533dcbecd24275381af86717d22baf30680efe..95b368d21330b6661460ce98c8e926d5ebd14898 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 2, - "uid": "gros-wattmetre3" - }, { "port": 23, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json index a5d175d8811e3d79fde2a693a41186e9fa721b79..8dde8e89de076cb55a0c5bc33fae452e69ab8edb 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 3, - "uid": "gros-wattmetre3" - }, { "port": 22, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json index ef53699fb7e41dc250ec90171702536c15577091..e49a091f11bce69e5cd98c0c539442cd0c5f4c23 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 6, - "uid": "gros-wattmetre3" - }, { "port": 13, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json index d9f57604c4f1d737836023b7bcc73fc2a573b709..8d494f6d492078d74ff3a24f770643d189d84279 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 7, - "uid": "gros-wattmetre3" - }, { "port": 17, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json index 61ec0bb55360f2450d0a8104ddb20f161d68a788..9f5e40e0c6a912f1bc7475db1d3b0a544358ac11 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 8, - "uid": "gros-wattmetre3" - }, { "port": 18, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json index f22bc7b806cd4ed578456a4b037f469890923f23..6361afedecd8928a66d9fd317d06740d465057b4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 11, - "uid": "gros-wattmetre1" - }, { "port": 7, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json index 2ceea83ca4151790be289bd1925e78dddaf83c4f..8482602823f31d631650bf8ef52ebc81082f2348 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 9, - "uid": "gros-wattmetre3" - }, { "port": 19, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json index 75740101d9b311517444b58464e3675361244536..c8a3bc27f6f36fc8640b29ac7a43b7ac7cfefdbd 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 10, - "uid": "gros-wattmetre3" - }, { "port": 20, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json index 101278d8a83373fd812e0f121d579c3800234c9b..dd3b7fceb7c7dcc2ee4ce1945a4ffeadab91ba56 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 11, - "uid": "gros-wattmetre3" - }, { "port": 21, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json index 39bcd88fdd917b1fc2c03022875bd067c0f855fe..043c21d1762ddb2e9c481c1640b3aaa8604e6d1c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 4, - "uid": "gros-wattmetre3" - }, { "port": 22, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json index a3be2f5164d8f6c37ebb3cdac381fff91b58080c..589d54bd9aa7ef9aee276ed8c8c61704713d6637 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 5, - "uid": "gros-wattmetre3" - }, { "port": 23, "uid": "gros-pdu8" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json index 8f4371014e090d2c59b3b62d918c1db3c867319a..3640fed59615bcea35c9b6f24a670de44ca83bc0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 12, - "uid": "gros-wattmetre1" - }, { "port": 7, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json index d6b15b9050a73c0adbb1a2b80ad0388b4f8f8f60..9720436eccdd1dba3ca8393d99b56772e220f624 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 13, - "uid": "gros-wattmetre1" - }, { "port": 9, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json index a47d23c667eb126b119c451d269019f631e48544..eecebf8a47c95981c1a0b5e412293183fc577359 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 14, - "uid": "gros-wattmetre1" - }, { "port": 10, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json index fd548475383918e43dac52363fcbfb4a2875daeb..56bffc3de3a88ebb43fbfd06de0f7ec766817a42 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 15, - "uid": "gros-wattmetre1" - }, { "port": 9, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json index ace3f045175e9fb14f2026bffa0240edae85821b..c0e13f141138df5b1032026363cdfb3f30e46e26 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 16, - "uid": "gros-wattmetre1" - }, { "port": 10, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json index d9aa474afe7b5aafaf1d4ca8f3e26a5510d0075d..43dcb53d38369b3336b63b8ad2e33524b7ce62b8 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 17, - "uid": "gros-wattmetre1" - }, { "port": 11, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json index 910ac630a8e8b2dd4058d2d0252b592c6e609394..e14c0c089b90783c26cf5b18f156b743b79ec8ca 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 18, - "uid": "gros-wattmetre1" - }, { "port": 11, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json index 14b159faadda6563984f3dcfb30da5de44c633a3..a5daa9ed181beb810336a165d3b5e418033f1dc9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 1, - "uid": "gros-wattmetre1" - }, { "port": 1, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json index 9fd16c7166e42f1446a6138e14a6f8541fad8dce..9f32b418eb48f18016da115d35af44cbb71f1d02 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 19, - "uid": "gros-wattmetre1" - }, { "port": 12, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json index c70134d7e460455982ed4781c3c006c4abb9219a..b2f2bd0f3db561e0ce8f114b14ba6f95973283f1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 20, - "uid": "gros-wattmetre1" - }, { "port": 12, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json index f2234e9e21b1890c26f50cc03b858bc271a54ce9..6e6e6d3bac5415c438720739e922e81a10ecf89c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 21, - "uid": "gros-wattmetre1" - }, { "port": 13, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json index ec049a61b906885a92997727a35aa389e4054db0..8672844c0f74c438cba20f48d8426ceb235236e0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 22, - "uid": "gros-wattmetre1" - }, { "port": 14, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json index 08b81248f9656217e88500faca95c65d4bfdfd8e..73afffbfc42428099851bb86854ab37268d1e722 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 23, - "uid": "gros-wattmetre1" - }, { "port": 13, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json index 4fa3fdee7767fe2c0795d8210e1f2e9a158ecf6b..c0e25d86326e4991ba20bea95a1a8d1961d2e167 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 24, - "uid": "gros-wattmetre1" - }, { "port": 14, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json index ba0f92a8ec96c78a5632c9f53b6845335e319d7d..9a5f2ab67917c9b98b56dd7497704bbe47dff6f4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 25, - "uid": "gros-wattmetre1" - }, { "port": 15, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json index 606ac1e1d4f44d6b9d9242e63b0774bca37d2b2b..df0b75067795043aaedc9146373809fea47df446 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 26, - "uid": "gros-wattmetre1" - }, { "port": 15, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json index 5578a4aab41e3fe512d037819f7e679fcf88d46c..dc247a318ac4934d62e78250784c1a83df2fe6ff 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 27, - "uid": "gros-wattmetre1" - }, { "port": 17, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json index 317a07af81ba92a2f175fff77da20f2056be43a9..7a29e8a426212da13b402d48765408352ab585ea 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 28, - "uid": "gros-wattmetre1" - }, { "port": 17, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json index 6d206ea161de4057dff08373dfafaf2a68d6956e..45fb1454b7f522d39337e24eca236742c6a22a85 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 2, - "uid": "gros-wattmetre1" - }, { "port": 2, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json index 8820fbd0930f22eb66715a4ad266677b10514c5f..b74ce1f63b22b7a5ecd0dc0ce6347b074542149f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 29, - "uid": "gros-wattmetre1" - }, { "port": 18, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json index aa5f899054d5fc008e39c44b2515ffa4f759f922..d22f045c73d6c022698bf62466b213e5727a1244 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 30, - "uid": "gros-wattmetre1" - }, { "port": 18, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json index 4185d420a05566087f6903e977acde435eb7e28f..6e6c848c935366f51ca30bbedbfb9383642a936f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 31, - "uid": "gros-wattmetre1" - }, { "port": 19, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json index 34d70a7e08c550ffd80d86990c142d2efc7fea74..d52dd31e62c29118a0c386859fb0d3e29bfc970d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 32, - "uid": "gros-wattmetre1" - }, { "port": 19, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json index edf6e2405357e68a80788b2e0b9853499a6c8d53..b3f9b07c6231471b09f4a7fa62101aba7be46b18 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 33, - "uid": "gros-wattmetre1" - }, { "port": 20, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json index 59b2b74f3a7bc52ab622927d9a9d28831167b8da..f3037f0264b98aa6d29152f8e1246faa59a15358 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 34, - "uid": "gros-wattmetre1" - }, { "port": 21, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json index a07db722ec48434f0605bc1c396fa5732c3cbbc2..570c160455fc06ed13ee5ee6a25840165f54ecb6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 35, - "uid": "gros-wattmetre1" - }, { "port": 20, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json index 3d6f7417149d269bb479abd15c316afaf5c03f52..2dd4cbf76e4a1c21f35718cc334fd94667b1ecee 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 36, - "uid": "gros-wattmetre1" - }, { "port": 22, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json index e1497bc6af46360c63076c413d14856feae6f8d7..0e66e5c586b1d554f7cabef0013455bcf46e8773 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 37, - "uid": "gros-wattmetre1" - }, { "port": 21, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json index edd7f15cfadb13d4ade0224c5ccd3148eb9c034c..b5fbb3bfab3a4166a5bcbbbbd810e9b1313c5cb9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 38, - "uid": "gros-wattmetre1" - }, { "port": 23, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json index 0463bc2d8d38a8cfac1e2bf73a6cbe0fddd7b0c2..721f537197681a649146595dc44cbf6dd7358a65 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 3, - "uid": "gros-wattmetre1" - }, { "port": 3, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json index c04746aac7f27c38841445c88a91b7e6396fad83..1962eeb4d651e1cc7fd23af1546f64ecbf1c7cb3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 39, - "uid": "gros-wattmetre1" - }, { "port": 23, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json index ca729e840801679af36df9262f5693b4ba5a8ffe..88bb81d512f06c3f8d80a2026cef4b7826e32784 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 4, - "uid": "gros-wattmetre1" - }, { "port": 3, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json index c8d9f950fc93555ddb32c792d86636a6da10ccbf..2862a48147c3df75439a2dbf28372657763bfecb 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 5, - "uid": "gros-wattmetre1" - }, { "port": 4, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json index e706f47b5272232825a2d0d1d832171aa18ed7be..7bd66caebc573bde140579afca52346e9b17b159 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 6, - "uid": "gros-wattmetre1" - }, { "port": 4, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json index f53c3546c2c14237412fdaaf0c59f3dade1749e9..312d5615a0221b4fda3da2d3f385cbe6cd9d7f8d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 42, - "uid": "gros-wattmetre3" - }, { "port": 1, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json index a4a916a040dbe795d4a19fc2e453e059539c1499..55ee05998a5703216cc964ec857238b7cc7a2d21 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 43, - "uid": "gros-wattmetre3" - }, { "port": 2, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json index 68a1fe0fae9d58800fba8f782ffdf468a14bba4a..45fcd8a3e8c7a60ceec3e64f722d9210f5832093 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 44, - "uid": "gros-wattmetre3" - }, { "port": 3, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json index 3c077ebec2db15a990e7afcb4130aa0ca4a44d46..6216de2b86b0effb53ef43e0de0c6cedbceacc96 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 7, - "uid": "gros-wattmetre1" - }, { "port": 5, "uid": "gros-pdu1" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json index 13e40c9cd59cc748cbedd40c0e1ac4198ecf1ce8..d14b760a2faf0609d479a13b11f8d1ff09f50546 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 45, - "uid": "gros-wattmetre3" - }, { "port": 1, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json index 05ee6b7068319ab3918b80f2fc0a64eab9ca6ee5..2a0f772753ef8bff4441c6e025602c282ae4f258 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 46, - "uid": "gros-wattmetre3" - }, { "port": 4, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json index 4afd8b3000724eb3b4332dc75fa5dbee1e7de290..db0681a14e91402a13c43d86f43379a4fb1acda4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 47, - "uid": "gros-wattmetre3" - }, { "port": 2, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json index a2ae93d2b6c6cc2a888d4464bec72aaf382b5112..1858774411112600ce95e13ccc3853597cbcaede 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 36, - "uid": "gros-wattmetre3" - }, { "port": 5, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json index 77fdb4b9b86b6ee0f81742035ccf16138491ca16..7703262cde4576196edb1f20c2310a193c7c6546 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 37, - "uid": "gros-wattmetre3" - }, { "port": 3, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json index 16e1191fbfa99e52254c32ce2a9edbd5d8ff596a..840052f2463dc3db8154d8cea9d560346375af15 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 38, - "uid": "gros-wattmetre3" - }, { "port": 6, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json index 5eb254829e73e78652438ff1d0c6fd528c7e7416..2fb7531a30b8a8313bf09c0c389373363557a805 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 39, - "uid": "gros-wattmetre3" - }, { "port": 4, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json index 56fae5c16b999493f289040f7a1598a47dd1dc43..d2e9d47f96d8e1ac606b81cd5f0753bc164dae2c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 40, - "uid": "gros-wattmetre3" - }, { "port": 5, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json index f961c1755184a4df6273c0928746c98d35801c56..db038ac7d993785a578e08e3ddd5111285166df1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 41, - "uid": "gros-wattmetre3" - }, { "port": 7, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json index 2dec2d236421c2c5de8fcb57155b7c190952743f..0d48fcd03bbc00267271119e32fee952de390b20 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 30, - "uid": "gros-wattmetre3" - }, { "port": 6, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json index 53b51d439fe21c191cb7b53112622728f3542989..02e60b1d853caf7b0f66dfc80dc180bf130dde5b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 8, - "uid": "gros-wattmetre1" - }, { "port": 5, "uid": "gros-pdu2" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json index d92e75d8abf3d0cbfab71523b52d0d50e28a98fd..070d166f1711039940b0cff413d0ef71bbc0e487 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 31, - "uid": "gros-wattmetre3" - }, { "port": 10, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json index d30a1b7fb7e2784d2d6eaccdf58073ec6c249361..30a1fda2ad205a34a85b76d2ab7ac9deac847978 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 32, - "uid": "gros-wattmetre3" - }, { "port": 7, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json index fcbfab5830961272ed385022754d835870073f1d..481a25500954a17a50d0bbf75ba4ead39e7633e3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 33, - "uid": "gros-wattmetre3" - }, { "port": 9, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json index 60c830163372badbd9fc8555de0a30515d650bb9..87d2899da1e6ca274965e5e7e2dbffc312597ef8 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 34, - "uid": "gros-wattmetre3" - }, { "port": 10, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json index a2029c0419d700e438b03f559aaa0cc274cf70fe..f791c1c8fbfdb86f400bd85fb4df94d43f5a488b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 35, - "uid": "gros-wattmetre3" - }, { "port": 9, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json index a21c8b0ebbf2fc59c7a6a3493c26331f76c342f8..6cd514257db00fbcdec39b929b56b21dda6c79f3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 24, - "uid": "gros-wattmetre3" - }, { "port": 11, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json index 83c80675c686fd6e765ea1ff8e3196f61ad75de5..77a6a16b794d86f8882208a9dcecfc2654bd4d4c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 25, - "uid": "gros-wattmetre3" - }, { "port": 12, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json index c7a9931b766587ddab0a295891b0988af8c7146d..40ab8626e2730c27d909c3dcee4da362e81ebe4a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 26, - "uid": "gros-wattmetre3" - }, { "port": 12, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json index 8bfb0da2dfa697642612e825872b1b04f442e600..c3055ee1e565481b1fb861dddb6f256fb2091d04 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 27, - "uid": "gros-wattmetre3" - }, { "port": 13, "uid": "gros-pdu6" diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json index 30197e8a2b93a30df37dd493a9925a17f1dd0855..e307d828fc3225241036348999995607cb73ff64 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json @@ -210,11 +210,6 @@ "turboboost_enabled": true }, "pdu": [ - { - "kind": "wattmetre-only", - "port": 28, - "uid": "gros-wattmetre3" - }, { "port": 13, "uid": "gros-pdu5" diff --git a/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json b/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json deleted file mode 100644 index b869dd9e50da9b7ec56606cde1dad0179d9ab4c1..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "ip": "172.16.79.15", - "kind": "wattmetre-only", - "metrics": [ - { - "description": "Power consumption per outlet reported by wattmetre, in watt", - "name": "wattmetre_power_watt", - "optional_period": 20, - "period": 1000, - "source": { - "protocol": "wattmetre" - } - } - ], - "model": "", - "ports": { - "0": "gros-1", - "1": "gros-2", - "10": "gros-11", - "11": "gros-12", - "12": "gros-13", - "13": "gros-14", - "14": "gros-15", - "15": "gros-16", - "16": "gros-17", - "17": "gros-18", - "18": "gros-19", - "19": "gros-20", - "2": "gros-3", - "20": "gros-21", - "21": "gros-22", - "22": "gros-23", - "23": "gros-24", - "24": "gros-25", - "25": "gros-26", - "26": "gros-27", - "27": "gros-28", - "28": "gros-29", - "29": "gros-30", - "3": "gros-4", - "30": "gros-31", - "31": "gros-32", - "32": "gros-33", - "33": "gros-34", - "34": "gros-35", - "35": "gros-36", - "36": "gros-37", - "37": "gros-38", - "38": "gros-39", - "39": "gros-40", - "4": "gros-5", - "5": "gros-6", - "6": "gros-7", - "7": "gros-8", - "8": "gros-9", - "9": "gros-10" - }, - "type": "pdu", - "uid": "gros-wattmetre1", - "vendor": "OmegaWatt" -} \ No newline at end of file diff --git a/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json b/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json deleted file mode 100644 index e8eda65f43891ae5caba3a7d58ebccc93a98b6bb..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "ip": "172.16.79.15", - "kind": "wattmetre-only", - "metrics": [ - { - "description": "Power consumption per outlet reported by wattmetre, in watt", - "name": "wattmetre_power_watt", - "optional_period": 20, - "period": 1000, - "source": { - "protocol": "wattmetre" - } - } - ], - "model": "", - "ports": { - "0": "gros-113", - "1": "gros-114", - "10": "gros-121", - "11": "gros-122", - "12": "gros-107", - "13": "gros-108", - "14": "gros-109", - "15": "gros-110", - "16": "gros-111", - "17": "gros-112", - "18": "gros-101", - "19": "gros-102", - "2": "gros-115", - "20": "gros-103", - "21": "gros-104", - "22": "gros-105", - "23": "gros-106", - "24": "gros-95", - "25": "gros-96", - "26": "gros-97", - "27": "gros-98", - "28": "gros-99", - "29": "gros-100", - "3": "gros-116", - "30": "gros-89", - "31": "gros-90", - "32": "gros-91", - "33": "gros-92", - "34": "gros-93", - "35": "gros-94", - "36": "gros-83", - "37": "gros-84", - "38": "gros-85", - "39": "gros-86", - "4": "gros-123", - "40": "gros-87", - "41": "gros-88", - "42": "gros-77", - "43": "gros-78", - "44": "gros-79", - "45": "gros-80", - "46": "gros-81", - "47": "gros-82", - "5": "gros-124", - "6": "gros-117", - "7": "gros-118", - "8": "gros-119", - "9": "gros-120" - }, - "type": "pdu", - "uid": "gros-wattmetre3", - "vendor": "OmegaWatt" -} \ No newline at end of file diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml index 2b8143213b5e9b62267ed9fd5dfd60c8caff4167..5d32933e88c80a4c9dd1d046a33c57a8d970f5c2 100644 --- a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml @@ -2,282 +2,162 @@ nodes: gros-1: pdu: - - uid: gros-wattmetre1 - kind: wattmetre-only - port: 0 - uid: gros-pdu2 port: 1 gros-2: pdu: - - uid: gros-wattmetre1 - port: 1 - kind: wattmetre-only - uid: gros-pdu1 port: 1 gros-3: pdu: - - uid: gros-wattmetre1 - port: 2 - kind: wattmetre-only - uid: gros-pdu2 port: 2 gros-4: pdu: - - uid: gros-wattmetre1 - port: 3 - kind: wattmetre-only - uid: gros-pdu1 port: 3 gros-5: pdu: - - uid: gros-wattmetre1 - port: 4 - kind: wattmetre-only - uid: gros-pdu2 port: 3 gros-6: pdu: - - uid: gros-wattmetre1 - port: 5 - kind: wattmetre-only - uid: gros-pdu1 port: 4 gros-7: pdu: - - uid: gros-wattmetre1 - port: 6 - kind: wattmetre-only - uid: gros-pdu2 port: 4 gros-8: pdu: - - uid: gros-wattmetre1 - port: 7 - kind: wattmetre-only - uid: gros-pdu1 port: 5 gros-9: pdu: - - uid: gros-wattmetre1 - port: 8 - kind: wattmetre-only - uid: gros-pdu2 port: 5 gros-10: pdu: - - uid: gros-wattmetre1 - port: 9 - kind: wattmetre-only - uid: gros-pdu1 port: 6 gros-11: pdu: - - uid: gros-wattmetre1 - port: 10 - kind: wattmetre-only - uid: gros-pdu2 port: 6 gros-12: pdu: - - uid: gros-wattmetre1 - port: 11 - kind: wattmetre-only - uid: gros-pdu1 port: 7 gros-13: pdu: - - uid: gros-wattmetre1 - port: 12 - kind: wattmetre-only - uid: gros-pdu2 port: 7 gros-14: pdu: - - uid: gros-wattmetre1 - port: 13 - kind: wattmetre-only - uid: gros-pdu1 port: 9 gros-15: pdu: - - uid: gros-wattmetre1 - port: 14 - kind: wattmetre-only - uid: gros-pdu1 port: 10 gros-16: pdu: - - uid: gros-wattmetre1 - port: 15 - kind: wattmetre-only - uid: gros-pdu2 port: 9 gros-17: pdu: - - uid: gros-wattmetre1 - port: 16 - kind: wattmetre-only - uid: gros-pdu2 port: 10 gros-18: pdu: - - uid: gros-wattmetre1 - port: 17 - kind: wattmetre-only - uid: gros-pdu1 port: 11 gros-19: pdu: - - uid: gros-wattmetre1 - port: 18 - kind: wattmetre-only - uid: gros-pdu2 port: 11 gros-20: pdu: - - uid: gros-wattmetre1 - port: 19 - kind: wattmetre-only - uid: gros-pdu1 port: 12 gros-21: pdu: - - uid: gros-wattmetre1 - port: 20 - kind: wattmetre-only - uid: gros-pdu2 port: 12 gros-22: pdu: - - uid: gros-wattmetre1 - port: 21 - kind: wattmetre-only - uid: gros-pdu1 port: 13 gros-23: pdu: - - uid: gros-wattmetre1 - port: 22 - kind: wattmetre-only - uid: gros-pdu1 port: 14 gros-24: pdu: - - uid: gros-wattmetre1 - port: 23 - kind: wattmetre-only - uid: gros-pdu2 port: 13 gros-25: pdu: - - uid: gros-wattmetre1 - port: 24 - kind: wattmetre-only - uid: gros-pdu2 port: 14 gros-26: pdu: - - uid: gros-wattmetre1 - port: 25 - kind: wattmetre-only - uid: gros-pdu1 port: 15 gros-27: pdu: - - uid: gros-wattmetre1 - port: 26 - kind: wattmetre-only - uid: gros-pdu2 port: 15 gros-28: pdu: - - uid: gros-wattmetre1 - port: 27 - kind: wattmetre-only - uid: gros-pdu2 port: 17 gros-29: pdu: - - uid: gros-wattmetre1 - port: 28 - kind: wattmetre-only - uid: gros-pdu1 port: 17 gros-30: pdu: - - uid: gros-wattmetre1 - port: 29 - kind: wattmetre-only - uid: gros-pdu2 port: 18 gros-31: pdu: - - uid: gros-wattmetre1 - port: 30 - kind: wattmetre-only - uid: gros-pdu1 port: 18 gros-32: pdu: - - uid: gros-wattmetre1 - port: 31 - kind: wattmetre-only - uid: gros-pdu1 port: 19 gros-33: pdu: - - uid: gros-wattmetre1 - port: 32 - kind: wattmetre-only - uid: gros-pdu2 port: 19 gros-34: pdu: - - uid: gros-wattmetre1 - port: 33 - kind: wattmetre-only - uid: gros-pdu1 port: 20 gros-35: pdu: - - uid: gros-wattmetre1 - port: 34 - kind: wattmetre-only - uid: gros-pdu1 port: 21 gros-36: pdu: - - uid: gros-wattmetre1 - port: 35 - kind: wattmetre-only - uid: gros-pdu2 port: 20 gros-37: pdu: - - uid: gros-wattmetre1 - port: 36 - kind: wattmetre-only - uid: gros-pdu1 port: 22 gros-38: pdu: - - uid: gros-wattmetre1 - port: 37 - kind: wattmetre-only - uid: gros-pdu2 port: 21 gros-39: pdu: - - uid: gros-wattmetre1 - port: 38 - kind: wattmetre-only - uid: gros-pdu1 port: 23 gros-40: pdu: - - uid: gros-wattmetre1 - port: 39 - kind: wattmetre-only - uid: gros-pdu2 port: 23 gros-41: @@ -534,337 +414,193 @@ nodes: port: 22 gros-77: pdu: - - uid: gros-wattmetre3 - port: 42 - kind: wattmetre-only - uid: gros-pdu5 port: 1 gros-78: pdu: - - uid: gros-wattmetre3 - port: 43 - kind: wattmetre-only - uid: gros-pdu5 port: 2 gros-79: pdu: - - uid: gros-wattmetre3 - port: 44 - kind: wattmetre-only - uid: gros-pdu5 port: 3 gros-80: pdu: - - uid: gros-wattmetre3 - port: 45 - kind: wattmetre-only - uid: gros-pdu6 port: 1 gros-81: pdu: - - uid: gros-wattmetre3 - port: 46 - kind: wattmetre-only - uid: gros-pdu5 port: 4 gros-82: pdu: - - uid: gros-wattmetre3 - port: 47 - kind: wattmetre-only - uid: gros-pdu6 port: 2 gros-83: pdu: - - uid: gros-wattmetre3 - port: 36 - kind: wattmetre-only - uid: gros-pdu5 port: 5 gros-84: pdu: - - uid: gros-wattmetre3 - port: 37 - kind: wattmetre-only - uid: gros-pdu6 port: 3 gros-85: pdu: - - uid: gros-wattmetre3 - port: 38 - kind: wattmetre-only - uid: gros-pdu5 port: 6 gros-86: pdu: - - uid: gros-wattmetre3 - port: 39 - kind: wattmetre-only - uid: gros-pdu6 port: 4 gros-87: pdu: - - uid: gros-wattmetre3 - port: 40 - kind: wattmetre-only - uid: gros-pdu6 port: 5 gros-88: pdu: - - uid: gros-wattmetre3 - port: 41 - kind: wattmetre-only - uid: gros-pdu5 port: 7 gros-89: pdu: - - uid: gros-wattmetre3 - port: 30 - kind: wattmetre-only - uid: gros-pdu6 port: 6 gros-90: pdu: - - uid: gros-wattmetre3 - port: 31 - kind: wattmetre-only - uid: gros-pdu6 port: 10 gros-91: pdu: - - uid: gros-wattmetre3 - port: 32 - kind: wattmetre-only - uid: gros-pdu6 port: 7 gros-92: pdu: - - uid: gros-wattmetre3 - port: 33 - kind: wattmetre-only - uid: gros-pdu5 port: 9 gros-93: pdu: - - uid: gros-wattmetre3 - port: 34 - kind: wattmetre-only - uid: gros-pdu5 port: 10 gros-94: pdu: - - uid: gros-wattmetre3 - port: 35 - kind: wattmetre-only - uid: gros-pdu6 port: 9 gros-95: pdu: - - uid: gros-wattmetre3 - port: 24 - kind: wattmetre-only - uid: gros-pdu5 port: 11 gros-96: pdu: - - uid: gros-wattmetre3 - port: 25 - kind: wattmetre-only - uid: gros-pdu6 port: 12 gros-97: pdu: - - uid: gros-wattmetre3 - port: 26 - kind: wattmetre-only - uid: gros-pdu5 port: 12 gros-98: pdu: - - uid: gros-wattmetre3 - port: 27 - kind: wattmetre-only - uid: gros-pdu6 port: 13 gros-99: pdu: - - uid: gros-wattmetre3 - port: 28 - kind: wattmetre-only - uid: gros-pdu5 port: 13 gros-100: pdu: - - uid: gros-wattmetre3 - port: 29 - kind: wattmetre-only - uid: gros-pdu6 port: 14 gros-101: pdu: - - uid: gros-wattmetre3 - port: 18 - kind: wattmetre-only - uid: gros-pdu5 port: 14 gros-102: pdu: - - uid: gros-wattmetre3 - port: 19 - kind: wattmetre-only - uid: gros-pdu6 port: 15 gros-103: pdu: - - uid: gros-wattmetre3 - port: 20 - kind: wattmetre-only - uid: gros-pdu6 port: 17 gros-104: pdu: - - uid: gros-wattmetre3 - port: 21 - kind: wattmetre-only - uid: gros-pdu5 port: 15 gros-105: pdu: - - uid: gros-wattmetre3 - port: 22 - kind: wattmetre-only - uid: gros-pdu5 port: 17 gros-106: pdu: - - uid: gros-wattmetre3 - port: 23 - kind: wattmetre-only - uid: gros-pdu6 port: 18 gros-107: pdu: - - uid: gros-wattmetre3 - port: 12 - kind: wattmetre-only - uid: gros-pdu6 port: 19 gros-108: pdu: - - uid: gros-wattmetre3 - port: 13 - kind: wattmetre-only - uid: gros-pdu5 port: 18 gros-109: pdu: - - uid: gros-wattmetre3 - port: 14 - kind: wattmetre-only - uid: gros-pdu6 port: 20 gros-110: pdu: - - uid: gros-wattmetre3 - port: 15 - kind: wattmetre-only - uid: gros-pdu5 port: 19 gros-111: pdu: - - uid: gros-wattmetre3 - port: 16 - kind: wattmetre-only - uid: gros-pdu5 port: 20 gros-112: pdu: - - uid: gros-wattmetre3 - port: 17 - kind: wattmetre-only - uid: gros-pdu6 port: 21 gros-113: pdu: - - uid: gros-wattmetre3 - port: 0 - kind: wattmetre-only - uid: gros-pdu6 port: 22 gros-114: pdu: - - uid: gros-wattmetre3 - port: 1 - kind: wattmetre-only - uid: gros-pdu5 port: 21 gros-115: pdu: - - uid: gros-wattmetre3 - port: 2 - kind: wattmetre-only - uid: gros-pdu6 port: 23 gros-116: pdu: - - uid: gros-wattmetre3 - port: 3 - kind: wattmetre-only - uid: gros-pdu5 port: 22 gros-117: pdu: - - uid: gros-wattmetre3 - port: 6 - kind: wattmetre-only - uid: gros-pdu8 port: 13 gros-118: pdu: - - uid: gros-wattmetre3 - port: 7 - kind: wattmetre-only - uid: gros-pdu8 port: 17 gros-119: pdu: - - uid: gros-wattmetre3 - port: 8 - kind: wattmetre-only - uid: gros-pdu8 port: 18 gros-120: pdu: - - uid: gros-wattmetre3 - port: 9 - kind: wattmetre-only - uid: gros-pdu8 port: 19 gros-121: pdu: - - uid: gros-wattmetre3 - port: 10 - kind: wattmetre-only - uid: gros-pdu8 port: 20 gros-122: pdu: - - uid: gros-wattmetre3 - port: 11 - kind: wattmetre-only - uid: gros-pdu8 port: 21 gros-123: pdu: - - uid: gros-wattmetre3 - port: 4 - kind: wattmetre-only - uid: gros-pdu8 port: 22 gros-124: pdu: - - uid: gros-wattmetre3 - port: 5 - kind: wattmetre-only - uid: gros-pdu8 port: 23 diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml index 07d5f4a6340f5d808ce0ad36e3a0a1ba8324dbd6..ce1450972fdbd30976c80a70d705934a487850ef 100644 --- a/input/grid5000/sites/nancy/pdus.yaml +++ b/input/grid5000/sites/nancy/pdus.yaml @@ -174,19 +174,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.534.6.6.7.6.5.1.3.0.%PORT% - gros-wattmetre1: - vendor: OmegaWatt - model: '' - ip: 172.16.79.15 - kind: wattmetre-only - metrics: - - name: wattmetre_power_watt - description: Power consumption per outlet reported by wattmetre, in watt - period: 1000 - optional_period: 20 - source: - protocol: wattmetre - gros-wattmetre2: vendor: OmegaWatt model: '' @@ -200,18 +187,6 @@ pdus: source: protocol: wattmetre - gros-wattmetre3: - vendor: OmegaWatt - model: '' - ip: 172.16.79.15 - kind: wattmetre-only - metrics: - - name: wattmetre_power_watt - description: Power consumption per outlet reported by wattmetre, in watt - period: 1000 - optional_period: 20 - source: - protocol: wattmetre gruss-pdu1: ip: 172.17.79.213 mac: 28:29:86:48:77:a8 diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb index 9f3c20b09324a11883977c47a87a0c3a151a0a55..7b91d2c2ecc83bb5478fcd3c56d41abacc78cee8 100644 --- a/lib/refrepo/valid/data/homogeneity.yaml.erb +++ b/lib/refrepo/valid/data/homogeneity.yaml.erb @@ -186,6 +186,10 @@ nancy: - ~storage_devices.pci-0000:17:00.0-scsi-0:0:1:0.vendor - ~storage_devices.pci-0000:17:00.0-scsi-0:0:1:0.model - ~storage_devices.pci-0000:17:00.0-scsi-0:0:1:0.firmware_version + gros-41: + - +pdu[1] + gros-77: + - -pdu[1] grcinq-2: - ~storage_devices.pci-0000:00:1f.2-ata-1.vendor - ~storage_devices.pci-0000:00:1f.2-ata-1.model