[lille][chirop] Describe DC-HdF PDUs and wattmetrev3-1

data/grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json

@@ -266,12 +266,12 @@
   },
   "pdu": [
     {
-      "port": 6,
-      "uid": "pdu-b5-1"
+      "port": 34,
+      "uid": "pdu-c4-1"
     },
     {
-      "port": 6,
-      "uid": "pdu-b5-2"
+      "port": 34,
+      "uid": "pdu-c4-2"
     },
     {
       "kind": "wattmetre-only",

data/grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json

@@ -266,12 +266,12 @@
   },
   "pdu": [
     {
-      "port": 1,
-      "uid": "pdu-b4-1"
+      "port": 22,
+      "uid": "pdu-c4-1"
     },
     {
-      "port": 1,
-      "uid": "pdu-b4-2"
+      "port": 22,
+      "uid": "pdu-c4-2"
     },
     {
       "kind": "wattmetre-only",

data/grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json

@@ -266,12 +266,12 @@
   },
   "pdu": [
     {
-      "port": 3,
-      "uid": "pdu-b3-1"
+      "port": 17,
+      "uid": "pdu-c4-1"
     },
     {
-      "port": 3,
-      "uid": "pdu-b3-2"
+      "port": 17,
+      "uid": "pdu-c4-2"
     },
     {
       "kind": "wattmetre-only",

data/grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json

@@ -266,12 +266,12 @@
   },
   "pdu": [
     {
-      "port": 7,
-      "uid": "pdu-b5-1"
+      "port": 35,
+      "uid": "pdu-c4-1"
     },
     {
-      "port": 7,
-      "uid": "pdu-b5-2"
+      "port": 35,
+      "uid": "pdu-c4-2"
     },
     {
       "kind": "wattmetre-only",

data/grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json

@@ -266,12 +266,12 @@
   },
   "pdu": [
     {
-      "port": 5,
-      "uid": "pdu-b6-1"
+      "port": 40,
+      "uid": "pdu-c4-1"
     },
     {
-      "port": 5,
-      "uid": "pdu-6b-2"
+      "port": 40,
+      "uid": "pdu-c4-2"
     },
     {
       "kind": "wattmetre-only",

data/grid5000/sites/lille/pdus/pdu-b3-2.json

-{
-  "model": "Unknown",
-  "ports": {
-    "3": "chirop-3"
-  },
-  "type": "pdu",
-  "uid": "pdu-b3-2",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b4-1.json

-{
-  "model": "Unknown",
-  "ports": {
-    "1": "chirop-2"
-  },
-  "type": "pdu",
-  "uid": "pdu-b4-1",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b4-2.json

-{
-  "model": "Unknown",
-  "ports": {
-    "1": "chirop-2"
-  },
-  "type": "pdu",
-  "uid": "pdu-b4-2",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b5-1.json

-{
-  "model": "Unknown",
-  "ports": {
-    "6": "chirop-1",
-    "7": "chirop-4"
-  },
-  "type": "pdu",
-  "uid": "pdu-b5-1",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b5-2.json

-{
-  "model": "Unknown",
-  "ports": {
-    "6": "chirop-1",
-    "7": "chirop-4"
-  },
-  "type": "pdu",
-  "uid": "pdu-b5-2",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b6-1.json

-{
-  "model": "Unknown",
-  "ports": {
-    "5": "chirop-5"
-  },
-  "type": "pdu",
-  "uid": "pdu-b6-1",
-  "vendor": "Unknown"
-}
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-6b-2.json → data/grid5000/sites/lille/pdus/pdu-c4-1.json

 {
   "model": "Unknown",
   "ports": {
-    "5": "chirop-5"
+    "17": "chirop-3",
+    "22": "chirop-2",
+    "34": "chirop-1",
+    "35": "chirop-4",
+    "40": "chirop-5"
   },
   "type": "pdu",
-  "uid": "pdu-6b-2",
+  "uid": "pdu-c4-1",
   "vendor": "Unknown"
 }
\ No newline at end of file

data/grid5000/sites/lille/pdus/pdu-b3-1.json → data/grid5000/sites/lille/pdus/pdu-c4-2.json

 {
   "model": "Unknown",
   "ports": {
-    "3": "chirop-3"
+    "17": "chirop-3",
+    "22": "chirop-2",
+    "34": "chirop-1",
+    "35": "chirop-4",
+    "40": "chirop-5"
   },
   "type": "pdu",
-  "uid": "pdu-b3-1",
+  "uid": "pdu-c4-2",
   "vendor": "Unknown"
 }
\ No newline at end of file

input/grid5000/sites/lille/pdus.yaml

@@ -56,115 +56,83 @@ pdus:
         optional_period: 10
         source:
           protocol: wattmetre
-      
-  pdu-b3-1:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      3:
-        uid: chirop-3
-        wattmetre: wattmetrev3-1
-        module: '04000612'
-        channel: 5
-        phase: 3
-        phase_inverted: false
 
-  pdu-b3-2:
+  pdu-c4-1:
     vendor: Unknown
     model: Unknown
     ports:
-      3:
+     17:
         uid: chirop-3
         wattmetre: wattmetrev3-1
         module: '04000612'
-        channel: 6
+        channel: 5
         phase: 3
         phase_inverted: false
-        
-
-  pdu-b4-1:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      1:
+     22:
         uid: chirop-2
         wattmetre: wattmetrev3-1
         module: '04000609'
         channel: 3
         phase: 1
         phase_inverted: false
-
-  pdu-b4-2:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      1:
-        uid: chirop-2
-        wattmetre: wattmetrev3-1
-        module: '04000609'
-        channel: 4
-        phase: 1
-        phase_inverted: false
-
-  pdu-b5-1:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      6:
+     34:
         uid: chirop-1
         wattmetre: wattmetrev3-1
         module: '04000609'
         channel: 1
         phase: 2
         phase_inverted: false
-      7:
+     35:
         uid: chirop-4
         wattmetre: wattmetrev3-1
         module: '04000612'
         channel: 3
         phase: 2
         phase_inverted: false
-
-
-  pdu-b5-2:
+     40:
+        uid: chirop-5
+        wattmetre: wattmetrev3-1
+        module: '04000612'
+        channel: 1
+        phase: 3
+        phase_inverted: false
+  
+  pdu-c4-2:
     vendor: Unknown
     model: Unknown
     ports:
-      6:
+     17:
+        uid: chirop-3
+        wattmetre: wattmetrev3-1
+        module: '04000612'
+        channel: 6
+        phase: 3
+        phase_inverted: false
+     22:
+        uid: chirop-2
+        wattmetre: wattmetrev3-1
+        module: '04000609'
+        channel: 4
+        phase: 1
+        phase_inverted: false
+     34:
         uid: chirop-1
         wattmetre: wattmetrev3-1
         module: '04000609'
         channel: 2
         phase: 2
         phase_inverted: false
-      7:
+     35:
         uid: chirop-4
         wattmetre: wattmetrev3-1
         module: '04000612'
         channel: 4
         phase: 2
         phase_inverted: false
-
-  pdu-b6-1:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      5:
-        uid: chirop-5
-        wattmetre: wattmetrev3-1
-        module: '04000612'
-        channel: 1
-        phase: 3
-        phase_inverted: false
-
-  pdu-6b-2:
-    vendor: Unknown
-    model: Unknown
-    ports:
-      5:
+     40:
         uid: chirop-5
         wattmetre: wattmetrev3-1
         module: '04000612'
         channel: 2
-        phase: 3
+        phase: 2
         phase_inverted: false