From d925adfa01e4b37ccfe2dcc2af4f038704aa97a9 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 19 Feb 2013 18:23:59 +0100
Subject: [PATCH] [admin] Fix generation of wattmetre OAR property
---
generators/lib/grid5000/node.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/generators/lib/grid5000/node.rb b/generators/lib/grid5000/node.rb
index 1137bdb25f5..e77c736d4b9 100644
--- a/generators/lib/grid5000/node.rb
+++ b/generators/lib/grid5000/node.rb
@@ -48,7 +48,8 @@ module Grid5000
h['gpu_count'] = properties['gpu']['gpu_count']
h['gpu_model'] = properties['gpu']['gpu_model']
properties["monitoring"] ||= {}
- h['wattmeter'] = properties['monitoring']['wattmeter'] ? properties['monitoring']['wattmeter'].upcase == "SHARED" ? "SHARED" : "YES" : "NO"
+ h['wattmeter'] = (properties['monitoring']['wattmeter'].is_a?(String) and properties['monitoring']['wattmeter'].upcase == "SHARED") ? "SHARED" \
+ : properties['monitoring']['wattmeter'] ? "YES" : "NO"
h['rconsole'] = properties['monitoring']['rconsole'] == false ? "NO" : "YES"
h
}
--
GitLab