Merge pull request #20146 from d-m-u/cleanup_the_hardware_query

nix the string interpolation on the hardware query in the aggregation mixin

(cherry picked from commit 9be2b9b)

app/models/container_project.rb

@@ -73,6 +73,7 @@ def perf_rollup_parents(interval_name = nil)
 
   # required by aggregate_hardware
   alias all_computer_system_ids computer_system_ids
+  alias all_computer_systems    computer_systems
 
   def aggregate_memory(targets = nil)
     aggregate_hardware(:computer_systems, :memory_mb, targets)

app/models/mixins/aggregation_mixin/methods.rb

@@ -41,10 +41,8 @@ def all_storages
     def aggregate_hardware(from, field, targets = nil)
       from      = from.to_s.singularize
       select    = field == :aggregate_cpu_speed ? "cpu_total_cores, cpu_speed" : field
-      targets ||= send("all_#{from}_ids")
-      targets   = targets.collect(&:id) unless targets.first.kind_of?(Integer)
-      hdws      = Hardware.where("#{from}_id".to_sym => targets).select(select)
-
+      targets ||= send("all_#{from.pluralize}")
+      hdws      = Hardware.where(from.singularize => targets).select(select)
       hdws.inject(0) { |t, hdw| t + hdw.send(field).to_i }
     end
 

spec/models/mixins/aggregation_mixin_spec.rb

@@ -112,6 +112,13 @@
     end
   end
 
+  describe "aggregate_hardware" do
+    it "calculates from hosts" do
+      cluster = cluster_2_1_host(hardware_args)
+      expect(cluster.aggregate_hardware("host", :aggregate_cpu_speed)).to eq(cpu_speed * 2)
+    end
+  end
+
   private
 
   def cluster_2_1_host(hardware_args)