[admin] Add support for value "shared" for "wattmeter" OAR property"

69e931d9 · Simon Delamare · 216449b9 · 69e931d9
Commit 69e931d9 authored Feb 05, 2013 by Simon Delamare
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

generators/lib/grid5000/node.rb generators/lib/grid5000/node.rb +1 -1

No files found.
--- a/generators/lib/grid5000/node.rb
+++ b/generators/lib/grid5000/node.rb
@@ -48,7 +48,7 @@ module Grid5000
        h['gpu_count']       = properties['gpu']['gpu_count']
        h['gpu_model']       = properties['gpu']['gpu_model']
        properties["monitoring"] ||= {}
-        h['wattmeter']       = properties['monitoring']['wattmeter'] ? "YES" : "NO"
+        h['wattmeter']       = properties['monitoring']['wattmeter'] ? properties['monitoring']['wattmeter'].upcase == "SHARED" ? "SHARED" : "YES" : "NO"
        h['rconsole']        = properties['monitoring']['rconsole'] == false ? "NO" : "YES"
        h
      }