Merge branch 'wattm-rennes' into 'master'

[wattmetre][rennes] Fix inconsistencies in modules declaration.

See merge request !774

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 0,
+      "port": 6,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 1,
+      "port": 7,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 6,
+      "port": 12,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 7,
+      "port": 13,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 8,
+      "port": 14,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 9,
+      "port": 15,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 10,
+      "port": 16,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 2,
+      "port": 8,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 11,
+      "port": 17,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 12,
+      "port": 0,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 13,
+      "port": 1,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 3,
+      "port": 9,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 4,
+      "port": 10,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json

@@ -205,7 +205,7 @@
     },
     {
       "kind": "wattmetre-only",
-      "port": 5,
+      "port": 11,
       "uid": "wattmetrev3-1"
     }
   ],

data/grid5000/sites/rennes/pdus/wattmetrev3-1.json

@@ -14,15 +14,18 @@
   ],
   "model": "v3",
   "ports": {
-    "0": "paradoxe-1",
-    "1": "paradoxe-2",
-    "10": "paradoxe-29",
-    "11": "paradoxe-30",
-    "12": "paradoxe-31",
-    "13": "paradoxe-32",
+    "0": "paradoxe-31",
+    "1": "paradoxe-32",
+    "10": "paradoxe-5",
+    "11": "paradoxe-6",
+    "12": "paradoxe-25",
+    "13": "paradoxe-26",
+    "14": "paradoxe-27",
+    "15": "paradoxe-28",
+    "16": "paradoxe-29",
+    "17": "paradoxe-30",
     "18": "paradoxe-7",
     "19": "paradoxe-8",
-    "2": "paradoxe-3",
     "20": "paradoxe-9",
     "21": "paradoxe-10",
     "22": "paradoxe-11",
@@ -33,19 +36,16 @@
     "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"
+    "6": "paradoxe-1",
+    "7": "paradoxe-2",
+    "8": "paradoxe-3",
+    "9": "paradoxe-4"
   },
   "serial": "02000361",
   "type": "pdu",

input/grid5000/sites/rennes/pdus.yaml

@@ -143,42 +143,42 @@ pdus:
         module: '04000603'
         channel: 1
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       23:
         uid: paradoxe-8
         wattmetre: wattmetrev3-1
         module: '04000603'
         channel: 2
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       22:
         uid: paradoxe-9
         wattmetre: wattmetrev3-1
         module: '04000603'
         channel: 3
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       21:
         uid: paradoxe-10
         wattmetre: wattmetrev3-1
         module: '04000603'
         channel: 4
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       20:
         uid: paradoxe-11
         wattmetre: wattmetrev3-1
         module: '04000603'
         channel: 5
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       18:
         uid: paradoxe-12
         wattmetre: wattmetrev3-1
         module: '04000603'
         channel: 6
         phase: 1
-        phase_inverted: false
+        phase_inverted: true
       5:
         uid: paradoxe-27
         wattmetre: wattmetrev3-1
@@ -302,15 +302,15 @@ pdus:
       5:
         uid: paradoxe-31
         wattmetre: wattmetrev3-1
-        module: '04000601'
-        channel: 1
+        module: '04000598'
+        channel: 5
         phase: 1
         phase_inverted: false
       4:
         uid: paradoxe-32
         wattmetre: wattmetrev3-1
-        module: '04000601'
-        channel: 2
+        module: '04000598'
+        channel: 6
         phase: 1
         phase_inverted: false