From 91dec16b4d211dc838c5f0f66b223f9e2b407822 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 8 Jan 2020 12:52:11 +0100
Subject: [PATCH] [grenoble][troll] Fix cluster pdu/wattmetre

---
 .../grenoble/clusters/troll/nodes/troll-1.json   |  4 ++--
 .../grenoble/clusters/troll/nodes/troll-2.json   |  4 ++--
 .../grenoble/clusters/troll/nodes/troll-3.json   |  4 ++--
 .../grenoble/clusters/troll/nodes/troll-4.json   |  4 ++--
 .../grid5000/sites/grenoble/pdus/wattmetre1.json |  6 +++++-
 .../sites/grenoble/clusters/troll/troll_pdu.yaml | 16 ++++++++--------
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
index d5e5f7bbd29..fe984e12c00 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
@@ -133,8 +133,8 @@
         },
         "pdu": [
           {
-            "port": 3,
-            "uid": "wattmetre9"
+            "port": 9,
+            "uid": "wattmetre1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
index f3584fabd39..389c581f4cf 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
@@ -133,8 +133,8 @@
         },
         "pdu": [
           {
-            "port": 4,
-            "uid": "wattmetre10"
+            "port": 10,
+            "uid": "wattmetre1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
index 60d8f2918f8..f31c6a31407 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
@@ -133,8 +133,8 @@
         },
         "pdu": [
           {
-            "port": 5,
-            "uid": "wattmetre11"
+            "port": 11,
+            "uid": "wattmetre1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
index 3e22b5d7e2a..f7e7d063160 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
@@ -133,8 +133,8 @@
         },
         "pdu": [
           {
-            "port": 6,
-            "uid": "wattmetre12"
+            "port": 12,
+            "uid": "wattmetre1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/grenoble/pdus/wattmetre1.json b/data/grid5000/sites/grenoble/pdus/wattmetre1.json
index 7a8a45331e3..0be177eb533 100644
--- a/data/grid5000/sites/grenoble/pdus/wattmetre1.json
+++ b/data/grid5000/sites/grenoble/pdus/wattmetre1.json
@@ -4,12 +4,16 @@
   "ports": {
     "0": "yeti-1",
     "1": "yeti-1",
+    "10": "troll-2",
+    "11": "troll-3",
+    "12": "troll-4",
     "2": "yeti-2",
     "3": "yeti-2",
     "4": "yeti-3",
     "5": "yeti-3",
     "6": "yeti-4",
-    "7": "yeti-4"
+    "7": "yeti-4",
+    "9": "troll-1"
   },
   "sensors": [
     {
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
index 0ff9c45cbc3..ebc464ee719 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
@@ -1,17 +1,17 @@
 nodes:
   troll-1:
     pdu:
-      - uid: wattmetre9
-        port: 3
+      - uid: wattmetre1
+        port: 9
   troll-2:
     pdu:
-      - uid: wattmetre10
-        port: 4
+      - uid: wattmetre1
+        port: 10
   troll-3:
     pdu:
-      - uid: wattmetre11
-        port: 5
+      - uid: wattmetre1
+        port: 11
   troll-4:
     pdu:
-      - uid: wattmetre12
-        port: 6
+      - uid: wattmetre1
+        port: 12
-- 
GitLab