Merge pull request #20871 from djberg96/storage_floats

Avoid direct float comparisons with 0.0 in storage.rb
ManageIQ · Jan 6, 2021 · 4d11d89 · 4d11d89
2 parents 65a5229 + 1b76d19
commit 4d11d89
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/app/models/storage.rb b/app/models/storage.rb
@@ -581,12 +581,12 @@ def used_space
  alias_method :v_used_space, :used_space
 
  def used_space_percent_of_total
- total_space.to_f == 0.0 ? 0.0 : (used_space.to_f / total_space.to_f * 1000.0).round / 10.0
+ total_space.zero? ? 0.0 : (used_space.to_f / total_space * 1000.0).round / 10.0
  end
  alias_method :v_used_space_percent_of_total, :used_space_percent_of_total
 
  def free_space_percent_of_total
- total_space.to_f == 0.0 ? 0.0 : (free_space.to_f / total_space.to_f * 1000.0).round / 10.0
+ total_space.zero? ? 0.0 : (free_space.to_f / total_space * 1000.0).round / 10.0
  end
  alias_method :v_free_space_percent_of_total, :free_space_percent_of_total
 
@@ -618,31 +618,31 @@ def v_total_vms
  alias_method :v_total_disk_size, :disk_size
 
  def v_debris_percent_of_used
- used_space.to_f == 0.0 ? 0.0 : (debris_size.to_f / used_space.to_f * 1000.0).round / 10.0
+ used_space.zero? ? 0.0 : (debris_size.to_f / used_space * 1000.0).round / 10.0
  end
 
  def v_snapshot_percent_of_used
- used_space.to_f == 0.0 ? 0.0 : (snapshot_size.to_f / used_space.to_f * 1000.0).round / 10.0
+ used_space.zero? ? 0.0 : (snapshot_size.to_f / used_space * 1000.0).round / 10.0
  end
 
  def v_memory_percent_of_used
- used_space.to_f == 0.0 ? 0.0 : (vm_ram_size.to_f / used_space.to_f * 1000.0).round / 10.0
+ used_space.zero? ? 0.0 : (vm_ram_size.to_f / used_space * 1000.0).round / 10.0
  end
 
  def v_vm_misc_percent_of_used
- used_space.to_f == 0.0 ? 0.0 : (vm_misc_size.to_f / used_space.to_f * 1000.0).round / 10.0
+ used_space.zero? ? 0.0 : (vm_misc_size.to_f / used_space * 1000.0).round / 10.0
  end
 
  def v_disk_percent_of_used
- used_space.to_f == 0.0 ? 0.0 : (disk_size.to_f / used_space.to_f * 1000.0).round / 10.0
+ used_space.zero? ? 0.0 : (disk_size.to_f / used_space * 1000.0).round / 10.0
  end
 
  def v_total_provisioned
  used_space + uncommitted.to_i
  end
 
  def v_provisioned_percent_of_total
- total_space.to_f == 0 ? 0.0 : (v_total_provisioned.to_f / total_space.to_f * 1000.0).round / 10.0
+ total_space.zero? ? 0.0 : (v_total_provisioned.to_f / total_space * 1000.0).round / 10.0
  end
 
  #