[deltacloud-devel] [PATCH core 13/25] * hardware_profile_helper (format_hardware_property): add in unit

[David Lutterkort]

From: David Lutterkort

---
 .../deltacloud/helpers/hardware_profiles_helper.rb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/lib/deltacloud/helpers/hardware_profiles_helper.rb b/server/lib/deltacloud/helpers/hardware_profiles_helper.rb
index 979f818..6269c23 100644
--- a/server/lib/deltacloud/helpers/hardware_profiles_helper.rb
+++ b/server/lib/deltacloud/helpers/hardware_profiles_helper.rb
@@ -2,14 +2,21 @@ module HardwareProfilesHelper

def format_hardware_property(prop)
     return "∅" unless prop
+    u = hardware_property_unit(prop)
     case prop.kind
       when :range
-      "#{prop.first} - #{prop.last} (default: #{prop.default})"
+      "#{prop.first} #{u} - #{prop.last} #{u} (default: #{prop.default} #{u})"
       when :enum
-      prop.values.join(', ') + " (default: #{prop.default})"
+      prop.values.collect{ |v| "#{v} #{u}"}.join(', ') + " (default: #{prop.default} #{u})"
       else
-        prop.value.to_s
+      "#{prop.value} #{u}"
     end
   end

+  def hardware_property_unit(prop)
+    u = prop.unit
+    u = "" if ["label", "count"].include?(u)
+    u = "vcpus" if prop.name == :cpu
+    u
+  end
 end