From c1cd7e31df36aeda6365e86487c4d1fdfe768343 Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Tue, 12 May 2020 17:14:52 +0200
Subject: [PATCH] [pyxis] Set wattmeter to true (FIX)

---
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json | 5 ++---
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json | 5 ++---
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json | 5 ++---
 data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json | 5 ++---
 input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml        | 3 ++-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
index 6deac9f9144..1b2ba7bb293 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
@@ -63,7 +63,7 @@
     "ram_size": 274877906944
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "true"
   },
   "network_adapters": [
     {
@@ -203,6 +203,5 @@
     "virtual": "arm64"
   },
   "type": "node",
-  "uid": "pyxis-1",
-  "wattmeter": true
+  "uid": "pyxis-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
index 2d3a4b108f2..644875e86cb 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
@@ -63,7 +63,7 @@
     "ram_size": 274877906944
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "true"
   },
   "network_adapters": [
     {
@@ -203,6 +203,5 @@
     "virtual": "arm64"
   },
   "type": "node",
-  "uid": "pyxis-2",
-  "wattmeter": true
+  "uid": "pyxis-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index f3f69989220..ba846c9b357 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -63,7 +63,7 @@
     "ram_size": 274877906944
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "true"
   },
   "network_adapters": [
     {
@@ -203,6 +203,5 @@
     "virtual": "arm64"
   },
   "type": "node",
-  "uid": "pyxis-3",
-  "wattmeter": true
+  "uid": "pyxis-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index 346d64cd5b8..00995a231ca 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -63,7 +63,7 @@
     "ram_size": 274877906944
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "true"
   },
   "network_adapters": [
     {
@@ -203,6 +203,5 @@
     "virtual": "arm64"
   },
   "type": "node",
-  "uid": "pyxis-4",
-  "wattmeter": true
+  "uid": "pyxis-4"
 }
\ No newline at end of file
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
index 7cec4dc9856..3d693fa6654 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -40,7 +40,8 @@ nodes:
       sdb:
         interface: SAS
         storage: HDD
-    wattmeter: true
+    monitoring:
+      wattmeter: true
     sensors:
       power:
         available: true
-- 
GitLab