change aggregation mixin methods into virtual attributes

app/models/container_project.rb

@@ -44,7 +44,6 @@ class ContainerProject < ApplicationRecord
 
   include EventMixin
   include Metric::CiMixin
-  include AggregationMixin::Methods
 
   PERF_ROLLUP_CHILDREN = :all_container_groups
 
@@ -71,20 +70,16 @@ def perf_rollup_parents(interval_name = nil)
     []
   end
 
-  # 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)
+    Hardware.where(:computer_system => computer_systems).sum(:memory_mb)
   end
 
   def aggregate_cpu_speed(targets = nil)
-    aggregate_hardware(:computer_systems, :cpu_speed, targets)
+    Hardware.where(:computer_system => computer_systems).sum(:cpu_speed)
   end
 
   def aggregate_cpu_total_cores(targets = nil)
-    aggregate_hardware(:computer_systems, :cpu_total_cores, targets)
+    Hardware.where(:computer_system => computer_systems).sum(:cpu_total_cores)
   end
 
   def disconnect_inv

app/models/ems_cluster.rb

@@ -20,6 +20,10 @@ class EmsCluster < ApplicationRecord
   has_many    :policy_events, -> { order("timestamp") }
   has_many    :miq_events,         :as => :target,   :dependent => :destroy
   has_many    :miq_alert_statuses, :as => :resource, :dependent => :destroy
+  has_many    :host_hardwares, :class_name => 'Hardware', :through => :hosts, :source => :hardware
+  has_many    :vm_hardwares, :class_name => 'Hardware', :through => :vms_and_templates, :source => :hardware
+  has_many    :storages, -> { distinct }, :through => :hosts
+  has_many    :lans, -> { distinct }, :through => :hosts
 
   has_many :switches, -> { distinct }, :through => :hosts
 
@@ -51,7 +55,6 @@ class EmsCluster < ApplicationRecord
   self.default_relationship_type = "ems_metadata"
 
   include AggregationMixin
-
   include Metric::CiMixin
   include MiqPolicyMixin
   include AsyncDeleteMixin
@@ -107,9 +110,6 @@ def total_vcpus
   # Relationship methods
   #
 
-  alias_method :storages,               :all_storages
-  alias_method :datastores,             :all_storages    # Used by web-services to return datastores as the property name
-
   # Direct Vm relationship methods
   def direct_vm_rels
     # Look for only the Vms at the second depth (default RP + 1)

app/models/ext_management_system.rb

@@ -206,6 +206,8 @@ def validate_zone_not_maintenance_when_ems_enabled?
   include RelationshipMixin
   self.default_relationship_type = "ems_metadata"
 
+  has_many :host_hardwares, :class_name => 'Hardware', :through => :hosts, :source => :hardware
+  has_many :vm_hardwares, :class_name => 'Hardware', :through => :vms_and_templates, :source => :hardware
   include AggregationMixin
 
   include AuthenticationMixin

app/models/host.rb

@@ -86,16 +86,18 @@ class Host < ApplicationRecord
                             :inverse_of => :host
   has_many                  :host_aggregate_hosts, :dependent => :destroy
   has_many                  :host_aggregates, :through => :host_aggregate_hosts
+  has_many :host_hardwares, :class_name => 'Hardware', :source => :hardware, :dependent => :nullify
+  has_many :vm_hardwares,   :class_name => 'Hardware', :through => :vms_and_templates, :source => :hardware
   has_one                   :conversion_host, :as => :resource, :dependent => :destroy, :inverse_of => :resource
 
   # Physical server reference
   belongs_to :physical_server, :inverse_of => :host
 
   serialize :settings, Hash
 
-  deprecate_attribute :address, :hostname
-  alias_attribute     :state,   :power_state
-  alias_attribute     :to_s,    :name
+  deprecate_attribute :address,  :hostname
+  alias_attribute     :state,    :power_state
+  alias_attribute     :to_s,     :name
 
   include ProviderObjectMixin
   include EventMixin
@@ -170,6 +172,7 @@ class Host < ApplicationRecord
   include AsyncDeleteMixin
   include ComplianceMixin
   include AvailabilityMixin
+  include AggregationMixin
 
   before_create :make_smart
   after_save    :process_events

app/models/manageiq/providers/container_manager.rb

@@ -39,6 +39,7 @@ class ContainerManager < BaseManager
     has_many :container_quota_items, :through => :container_quotas
     has_many :container_limit_items, :through => :container_limits
     has_many :container_template_parameters, :through => :container_templates
+    has_many :computer_system_hardwares, :class_name => 'Hardware', :through => :computer_systems, :source => :hardware
 
     # Archived and active entities to destroy when the container manager is deleted
     has_many :all_containers, :foreign_key => :ems_id, :dependent => :destroy, :class_name => "Container"
@@ -67,18 +68,6 @@ def supports_metrics?
       true
     end
 
-    # required by aggregate_hardware
-    alias :all_computer_systems :computer_systems
-    alias :all_computer_system_ids :computer_system_ids
-
-    def aggregate_cpu_total_cores(targets = nil)
-      aggregate_hardware(:computer_systems, :cpu_total_cores, targets)
-    end
-
-    def aggregate_memory(targets = nil)
-      aggregate_hardware(:computer_systems, :memory_mb, targets)
-    end
-
     class << model_name
       define_method(:route_key) { "ems_containers" }
       define_method(:singular_route_key) { "ems_container" }

app/models/miq_enterprise.rb

@@ -17,8 +17,6 @@ class MiqEnterprise < ApplicationRecord
   acts_as_miq_taggable
 
   include SupportsFeatureMixin
-  include AggregationMixin
-
   include MiqPolicyMixin
   include Metric::CiMixin
 

app/models/miq_region.rb

@@ -24,7 +24,6 @@ class MiqRegion < ApplicationRecord
   acts_as_miq_taggable
   include UuidMixin
   include NamingSequenceMixin
-  include AggregationMixin
   include ConfigurationManagementMixin
 
   include MiqPolicyMixin

app/models/miq_server.rb

@@ -491,15 +491,15 @@ def self.managed_resources
     {
       :vms                     => Vm.active.count,
       :hosts                   => Host.active.count,
-      :aggregate_physical_cpus => MiqRegion.my_region.aggregate_physical_cpus(Host.active),
+      :aggregate_physical_cpus => Host.active.in_my_region.sum(:aggregate_physical_cpus),
     }
   end
 
   def self.unmanaged_resources
     {
       :vms                     => Vm.not_active.count,
       :hosts                   => Host.archived.count,
-      :aggregate_physical_cpus => MiqRegion.my_region.aggregate_physical_cpus(Host.archived),
+      :aggregate_physical_cpus => Host.archived.in_my_region.sum(:aggregate_physical_cpus),
     }
   end
 

app/models/mixins/aggregation_mixin.rb

@@ -1,23 +1,12 @@
 module AggregationMixin
   extend ActiveSupport::Concern
   included do
-    virtual_column :aggregate_cpu_speed,       :type => :integer, :uses => :hosts
-    virtual_column :aggregate_cpu_total_cores, :type => :integer, :uses => :hosts
-    virtual_column :aggregate_physical_cpus,   :type => :integer, :uses => :hosts
-    virtual_column :aggregate_memory,          :type => :integer, :uses => :hosts
-    virtual_column :aggregate_vm_cpus,         :type => :integer, :uses => :vms_and_templates
-    virtual_column :aggregate_vm_memory,       :type => :integer, :uses => :vms_and_templates
-    virtual_column :aggregate_disk_capacity,   :type => :integer, :uses => :hosts
-
-    alias_method :all_hosts,              :hosts
-    alias_method :all_host_ids,           :host_ids
-    alias_method :all_vms_and_templates,  :vms_and_templates
-    alias_method :all_vm_or_template_ids, :vm_or_template_ids
-    alias_method :all_vms,                :vms
-    alias_method :all_vm_ids,             :vm_ids
-    alias_method :all_miq_templates,      :miq_templates
-    alias_method :all_miq_template_ids,   :miq_template_ids
-
-    include AggregationMixin::Methods
+    virtual_aggregate :aggregate_cpu_speed,       :host_hardwares, :sum, :aggregate_cpu_speed
+    virtual_aggregate :aggregate_cpu_total_cores, :host_hardwares, :sum, :cpu_total_cores
+    virtual_aggregate :aggregate_disk_capacity,   :host_hardwares, :sum, :disk_capacity
+    virtual_aggregate :aggregate_memory,          :host_hardwares, :sum, :memory_mb
+    virtual_aggregate :aggregate_physical_cpus,   :host_hardwares, :sum, :cpu_sockets
+    virtual_aggregate :aggregate_vm_cpus,         :vm_hardwares,   :sum, :cpu_sockets
+    virtual_aggregate :aggregate_vm_memory,       :vm_hardwares,   :sum, :memory_mb
   end
 end

app/models/mixins/relationships_aggregation_mixin.rb

@@ -8,8 +8,6 @@ module RelationshipsAggregationMixin
     virtual_column :aggregate_vm_cpus,         :type => :integer, :uses => :all_relationships
     virtual_column :aggregate_vm_memory,       :type => :integer, :uses => :all_relationships
     virtual_column :aggregate_disk_capacity,   :type => :integer, :uses => :all_relationships
-
-    include AggregationMixin::Methods
   end
 
   # Default implementations which can be overridden with something more optimized

app/models/zone.rb

@@ -27,6 +27,8 @@ class Zone < ApplicationRecord
   has_many :container_groups,      :through => :container_managers
   has_many :container_replicators, :through => :container_managers
   has_many :containers,            :through => :container_managers
+  has_many :host_hardwares, :class_name => 'Hardware', :through => :hosts, :source => :hardware
+  has_many :vm_hardwares, :class_name => 'Hardware', :through => :vms_and_templates, :source => :hardware
   virtual_has_many :active_miq_servers, :class_name => "MiqServer"
 
   before_destroy :remove_servers_if_podified

spec/models/ems_cluster_spec.rb

@@ -1,4 +1,5 @@
 RSpec.describe EmsCluster do
+  include_examples "AggregationMixin"
   context("VMware") do
     before do
       @cluster = FactoryBot.create(:ems_cluster)
@@ -37,16 +38,10 @@
     it('#direct_miq_template_ids')    { expect(@cluster.direct_miq_template_ids).to    match_array [@template1.id, @template2.id] }
     it('#total_direct_miq_templates') { expect(@cluster.total_direct_miq_templates).to eq(2) }
 
-    it('#all_vms_and_templates')   { expect(@cluster.all_vms_and_templates).to   match_array [@vm1, @vm2, @template1, @template2] }
-    it('#all_vm_or_template_ids')  { expect(@cluster.all_vm_or_template_ids).to  match_array [@vm1.id, @vm2.id, @template1.id, @template2.id] }
     it('#total_vms_and_templates') { expect(@cluster.total_vms_and_templates).to eq(4) }
 
-    it('#all_vms')    { expect(@cluster.all_vms).to    match_array [@vm1, @vm2] }
-    it('#all_vm_ids') { expect(@cluster.all_vm_ids).to match_array [@vm1.id, @vm2.id] }
     it('#total_vms')  { expect(@cluster.total_vms).to eq(2) }
 
-    it('#all_miq_templates')    { expect(@cluster.all_miq_templates).to    match_array [@template1, @template2] }
-    it('#all_miq_template_ids') { expect(@cluster.all_miq_template_ids).to match_array [@template1.id, @template2.id] }
     it('#total_miq_templates')  { expect(@cluster.total_miq_templates).to eq(2) }
 
     it('ResourcePool#v_direct_vms') { expect(@rp1.v_direct_vms).to eq(1) }
@@ -55,7 +50,6 @@
     it('ResourcePool#v_direct_miq_templates') { expect(@rp1.v_direct_vms).to eq(1) }
     it('ResourcePool#v_total_miq_templates')  { expect(@rp1.v_total_vms).to eq(2) }
     it('#hosts') { expect(@cluster.hosts).to match_array [@host1, @host2] }
-    it('#all_hosts') { expect(@cluster.all_hosts).to match_array [@host1, @host2] }
     it('#total_hosts') { expect(@cluster.total_hosts).to eq(2) }
   end
 
@@ -98,44 +92,63 @@
     it('#direct_miq_template_ids')    { expect(@cluster.direct_miq_template_ids).to    match_array [@template1.id, @template2.id] }
     it('#total_direct_miq_templates') { expect(@cluster.total_direct_miq_templates).to eq(2) }
 
-    it('#all_vms_and_templates')   { expect(@cluster.all_vms_and_templates).to   match_array [@vm1, @vm2, @template1, @template2] }
-    it('#all_vm_or_template_ids')  { expect(@cluster.all_vm_or_template_ids).to  match_array [@vm1.id, @vm2.id, @template1.id, @template2.id] }
     it('#total_vms_and_templates') { expect(@cluster.total_vms_and_templates).to eq(4) }
 
-    it('#all_vms')    { expect(@cluster.all_vms).to    match_array [@vm1, @vm2] }
-    it('#all_vm_ids') { expect(@cluster.all_vm_ids).to match_array [@vm1.id, @vm2.id] }
     it('#total_vms')  { expect(@cluster.total_vms).to eq(2) }
 
-    it('#all_miq_templates')    { expect(@cluster.all_miq_templates).to    match_array [@template1, @template2] }
-    it('#all_miq_template_ids') { expect(@cluster.all_miq_template_ids).to match_array [@template1.id, @template2.id] }
     it('#total_miq_templates')  { expect(@cluster.total_miq_templates).to eq(2) }
     it('#hosts')                { expect(@cluster.hosts).to match_array [@host1, @host2] }
-    it('#all_hosts')            { expect(@cluster.all_hosts).to match_array [@host1, @host2] }
     it('#total_hosts')          { expect(@cluster.total_hosts).to eq(2) }
   end
 
-  it "#save_drift_state" do
-    # TODO: Beef up with more data
-    cluster = FactoryBot.create(:ems_cluster)
-    cluster.save_drift_state
-
-    expect(cluster.drift_states.size).to eq(1)
-    expect(DriftState.count).to eq(1)
-
-    expect(cluster.drift_states.first.data).to eq({
-      :aggregate_cpu_speed       => 0,
-      :aggregate_cpu_total_cores => 0,
-      :aggregate_memory          => 0,
-      :aggregate_physical_cpus   => 0,
-      :aggregate_vm_cpus         => 0,
-      :aggregate_vm_memory       => 0,
-      :class                     => "EmsCluster",
-      :id                        => cluster.id,
-      :name                      => cluster.name,
-      :vms                       => [],
-      :miq_templates             => [],
-      :hosts                     => [],
-    })
+  context("#save_drift_state") do
+    it "without aggregate data" do
+      # TODO: Beef up with more data
+      cluster = FactoryBot.create(:ems_cluster)
+      cluster.save_drift_state
+
+      expect(cluster.drift_states.size).to eq(1)
+      expect(DriftState.count).to eq(1)
+
+      expect(cluster.drift_states.first.data).to eq(
+        :class         => "EmsCluster",
+        :id            => cluster.id,
+        :name          => cluster.name,
+        :vms           => [],
+        :miq_templates => [],
+        :hosts         => []
+      )
+    end
+
+    it "with aggregate data" do
+      cluster = FactoryBot.create(:ems_cluster)
+      host = FactoryBot.create(:host,
+                               :ems_cluster           => cluster,
+                               :ext_management_system => FactoryBot.create(:ext_management_system),
+                               :hardware              => FactoryBot.build(:hardware,
+                                                                          :cpu_total_cores => 4,
+                                                                          :cpu_speed       => 1000,
+                                                                          :memory_mb       => 2_048))
+
+      vm = FactoryBot.create(:vm_redhat, :host => host, :ems_cluster => cluster)
+
+      cluster.save_drift_state
+
+      expect(cluster.drift_states.size).to eq(1)
+      expect(DriftState.count).to eq(1)
+      expect(cluster.drift_states.first.data).to eq(
+        :aggregate_cpu_speed       => 4000,
+        :aggregate_cpu_total_cores => 4,
+        :aggregate_memory          => 2048,
+        :aggregate_physical_cpus   => 1,
+        :class                     => "EmsCluster",
+        :id                        => cluster.id,
+        :name                      => cluster.name,
+        :vms                       => [{:class => "ManageIQ::Providers::Redhat::InfraManager::Vm", :id => vm.id}],
+        :miq_templates             => [],
+        :hosts                     => [{:class => "Host", :id => host.id}]
+      )
+    end
   end
 
   context("#perf_capture_enabled_host_ids=") do

spec/models/ext_management_system_spec.rb

@@ -1,4 +1,5 @@
 RSpec.describe ExtManagementSystem do
+  include_examples "AggregationMixin"
   describe ".with_tenant" do
     # tenant_root
     #   \___ tenant_eye_bee_em (service_template_eye_bee_em)