Merge pull request #17747 from lpichler/fix_translation_from_v_derive…

…d_cpu_total_cores_used_to_cpu_usage_rate_average_chargeback_for_projects Move VIRTUAL_COL_USES translation to col_index method in ChargeableField (cherry picked from commit ee216b0) https://bugzilla.redhat.com/show_bug.cgi?id=1613295
ManageIQ · Aug 17, 2018 · ced41ae · ced41ae
1 parent c00eb23
commit ced41ae
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/models/chargeable_field.rb b/app/models/chargeable_field.rb
@@ -90,6 +90,7 @@ def self.cols_on_metric_rollup
 
   def self.col_index(column)
     @rate_cols ||= {}
+    column = VIRTUAL_COL_USES[column] || column
     @rate_cols[column] ||= cols_on_metric_rollup.index(column.to_s)
   end
 

diff --git a/app/models/chargeback/consumption_with_rollups.rb b/app/models/chargeback/consumption_with_rollups.rb
@@ -71,7 +71,6 @@ def tag_list_with_prefix
     end
 
     def sum(metric, sub_metric = nil)
-      metric = ChargeableField::VIRTUAL_COL_USES[metric] || metric
       values(metric, sub_metric).sum
     end
 

diff --git a/spec/factories/chargeable_field.rb b/spec/factories/chargeable_field.rb
@@ -46,7 +46,7 @@
 
   factory :chargeable_field_cpu_cores_used, :parent => :chargeable_field do
     description 'Used CPU in Cores'
-    metric      'cpu_usage_rate_average'
+    metric      'v_derived_cpu_total_cores_used'
     group       'cpu_cores'
     source      'used'
   end