diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
index 2b8143213b5e9b62267ed9fd5dfd60c8caff4167..5ffb3dd49d6e1d1d8137b905b5aab5735b5a406a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
@@ -2,282 +2,282 @@
 nodes:
   gros-1:
     pdu:
-    - uid: gros-wattmetre1
-      kind: wattmetre-only
-      port: 0
+#    - 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-wattmetre1
+#      port: 1
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 1
   gros-3:
     pdu:
-    - uid: gros-wattmetre1
-      port: 2
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 3
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 3
   gros-5:
     pdu:
-    - uid: gros-wattmetre1
-      port: 4
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 5
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 4
   gros-7:
     pdu:
-    - uid: gros-wattmetre1
-      port: 6
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 7
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 5
   gros-9:
     pdu:
-    - uid: gros-wattmetre1
-      port: 8
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 9
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 6
   gros-11:
     pdu:
-    - uid: gros-wattmetre1
-      port: 10
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 11
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 7
   gros-13:
     pdu:
-    - uid: gros-wattmetre1
-      port: 12
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 13
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 9
   gros-15:
     pdu:
-    - uid: gros-wattmetre1
-      port: 14
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 15
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 9
   gros-17:
     pdu:
-    - uid: gros-wattmetre1
-      port: 16
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 17
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 11
   gros-19:
     pdu:
-    - uid: gros-wattmetre1
-      port: 18
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 19
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 12
   gros-21:
     pdu:
-    - uid: gros-wattmetre1
-      port: 20
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 21
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 13
   gros-23:
     pdu:
-    - uid: gros-wattmetre1
-      port: 22
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 23
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 13
   gros-25:
     pdu:
-    - uid: gros-wattmetre1
-      port: 24
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 25
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 15
   gros-27:
     pdu:
-    - uid: gros-wattmetre1
-      port: 26
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 27
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 17
   gros-29:
     pdu:
-    - uid: gros-wattmetre1
-      port: 28
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 29
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 18
   gros-31:
     pdu:
-    - uid: gros-wattmetre1
-      port: 30
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 31
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 19
   gros-33:
     pdu:
-    - uid: gros-wattmetre1
-      port: 32
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 33
+#      kind: wattmetre-only
     - uid: gros-pdu1
       port: 20
   gros-35:
     pdu:
-    - uid: gros-wattmetre1
-      port: 34
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 35
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 20
   gros-37:
     pdu:
-    - uid: gros-wattmetre1
-      port: 36
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 37
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 21
   gros-39:
     pdu:
-    - uid: gros-wattmetre1
-      port: 38
-      kind: wattmetre-only
+#    - 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-wattmetre1
+#      port: 39
+#      kind: wattmetre-only
     - uid: gros-pdu2
       port: 23
   gros-41:
@@ -534,337 +534,337 @@ nodes:
       port: 22
   gros-77:
     pdu:
-    - uid: gros-wattmetre3
-      port: 42
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 43
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 2
   gros-79:
     pdu:
-    - uid: gros-wattmetre3
-      port: 44
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 45
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 1
   gros-81:
     pdu:
-    - uid: gros-wattmetre3
-      port: 46
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 47
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 2
   gros-83:
     pdu:
-    - uid: gros-wattmetre3
-      port: 36
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 37
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 3
   gros-85:
     pdu:
-    - uid: gros-wattmetre3
-      port: 38
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 39
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 4
   gros-87:
     pdu:
-    - uid: gros-wattmetre3
-      port: 40
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 41
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 7
   gros-89:
     pdu:
-    - uid: gros-wattmetre3
-      port: 30
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 31
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 10
   gros-91:
     pdu:
-    - uid: gros-wattmetre3
-      port: 32
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 33
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 9
   gros-93:
     pdu:
-    - uid: gros-wattmetre3
-      port: 34
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 35
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 9
   gros-95:
     pdu:
-    - uid: gros-wattmetre3
-      port: 24
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 25
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 12
   gros-97:
     pdu:
-    - uid: gros-wattmetre3
-      port: 26
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 27
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 13
   gros-99:
     pdu:
-    - uid: gros-wattmetre3
-      port: 28
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 29
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 14
   gros-101:
     pdu:
-    - uid: gros-wattmetre3
-      port: 18
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 19
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 15
   gros-103:
     pdu:
-    - uid: gros-wattmetre3
-      port: 20
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 21
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 15
   gros-105:
     pdu:
-    - uid: gros-wattmetre3
-      port: 22
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 23
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 18
   gros-107:
     pdu:
-    - uid: gros-wattmetre3
-      port: 12
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 13
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 18
   gros-109:
     pdu:
-    - uid: gros-wattmetre3
-      port: 14
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 15
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 19
   gros-111:
     pdu:
-    - uid: gros-wattmetre3
-      port: 16
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 17
+#      kind: wattmetre-only
     - uid: gros-pdu6
       port: 21
   gros-113:
     pdu:
-    - uid: gros-wattmetre3
-      port: 0
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 1
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 21
   gros-115:
     pdu:
-    - uid: gros-wattmetre3
-      port: 2
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 3
+#      kind: wattmetre-only
     - uid: gros-pdu5
       port: 22
   gros-117:
     pdu:
-    - uid: gros-wattmetre3
-      port: 6
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 7
+#      kind: wattmetre-only
     - uid: gros-pdu8
       port: 17
   gros-119:
     pdu:
-    - uid: gros-wattmetre3
-      port: 8
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 9
+#      kind: wattmetre-only
     - uid: gros-pdu8
       port: 19
   gros-121:
     pdu:
-    - uid: gros-wattmetre3
-      port: 10
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 11
+#      kind: wattmetre-only
     - uid: gros-pdu8
       port: 21
   gros-123:
     pdu:
-    - uid: gros-wattmetre3
-      port: 4
-      kind: wattmetre-only
+#    - 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-wattmetre3
+#      port: 5
+#      kind: wattmetre-only
     - uid: gros-pdu8
       port: 23
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 10c9305a256508dcd24c5cdd56d070d58c1cb5c0..1561c635a5622c79761efe882c5636c521ffec04 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -89,6 +89,11 @@ nancy:
     - ~network_adapters.eth2.name
     - ~network_adapters.eth3.name
     - +network_adapters.ib0
+  gros-41:
+    - +pdu[1]
+  gros-77:
+    - -pdu[1]
+    - +pdu
 nantes:
   econome-[1-22]:
     - +network_adapters.eth2.rate