diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json index eb1ae5624eb2ad5390ca4f503ad4c5c168c89ef9..42d2537bac0dd17fc98fc3c08fb0d45ff1f58cfc 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-1.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 0, + "port": 6, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json index 279fdf2a8e6c6bc52593d8081fe5b28125dfaea0..a3034e83e0b5b3828781e24f57e7ec53493eb173 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-2.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 1, + "port": 7, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json index 801a52dbbbbb2e27fdbc92772bf06081b5f15bba..9f756af5014a00d51cf7124eea7287c3c3be236d 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-25.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 6, + "port": 12, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json index e2823ff16165ca0b339e05aac0c1eeec5388470a..70efde783d5f04ca65102e545f7f7d7d6891c96e 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-26.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 7, + "port": 13, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json index e7a6bbd129691a86ce7f6820259fa35417a43ace..420a4b175c72f90092acb590034014b6b8278ce8 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-27.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 8, + "port": 14, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json index f557b6d441ebcee0c3a237e555963f2440271441..4e02e36547971c95a469fa84334abad7bbc0d3f0 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-28.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 9, + "port": 15, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json index 8ba42e81b013b7ef9d8880f6759fa5fd69ab36a3..3f9c5ab7825b64957c661a0a8003651333f3ea6f 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-29.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 10, + "port": 16, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json index 3a9a4f2a801e53f0bea558b348f35a92be2c4141..21c6319b4dd98dde81607616a0d78bbce0086d9c 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-3.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 2, + "port": 8, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json index 25f9c78c266f7968483874df58ba4659751e754d..721d513a980119c844b48c6490fcda863b24248b 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-30.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 11, + "port": 17, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json index 159747355e256d3200d2c3848faf8537ce0dd934..b224802e4f3594ee3ea5b9d40f0380438a68f425 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 12, + "port": 0, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json index 4527a6e7e4c6acb170db6c50cb8bd81632ea364f..2de6075544eb89c50a2e97ec8a4eada3c09c32ed 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 13, + "port": 1, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json index 858034b011cfa2e1de72470d29e9c8ed0bed7660..e1a3018c3f3b4f8ab4a48c03608a1ef2bfcaa375 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 3, + "port": 9, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json index bbed55925b3b9d55f283fd4e9054a3f857900df3..3435f2904147f8f51ff1ce61961acd7cc63a0a33 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-5.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 4, + "port": 10, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json index 7091008f446f3087e2e6e07833b4f41ff3f8362c..42adec332e964c896a1f4feb3102112e432673e2 100644 --- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json +++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-6.json @@ -205,7 +205,7 @@ }, { "kind": "wattmetre-only", - "port": 5, + "port": 11, "uid": "wattmetrev3-1" } ], diff --git a/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json b/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json index 293d956498bab887a45670946448f53611236225..2688f8b743a893b4ea777db419ad886148c0669d 100644 --- a/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json +++ b/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", diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml index 1f0fa904222eca8cea5569a822e3a9eb3e1d2ae7..97b88931aaa94ee19ed3af8f9a7acb87d35bc472 100644 --- a/input/grid5000/sites/rennes/pdus.yaml +++ b/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