Merge pull request ManageIQ#16255 from imtayadeway/revert-a7597b65273…

…b9c6089ee19a887cd85c72d1f8f08

Fix Expression builder argument error by reverting ManageIQ#5506
(cherry picked from commit 075ae85)

https://bugzilla.redhat.com/show_bug.cgi?id=1514258

app/models/host.rb

@@ -188,10 +188,6 @@ class Host < ApplicationRecord
     end
   end
 
-  def self.include_descendant_classes_in_expressions?
-    true
-  end
-
   def self.non_clustered
     where(:ems_cluster_id => nil)
   end

app/models/vm.rb

@@ -12,10 +12,6 @@ def self.base_model
     Vm
   end
 
-  def self.include_descendant_classes_in_expressions?
-    true
-  end
-
   def self.corresponding_model
     if self == Vm
       MiqTemplate

lib/miq_expression.rb

@@ -169,6 +169,7 @@ class MiqExpression
     storage_files
     switches
     tenant_quotas
+    tenants
     users
     vms
     volumes
@@ -1293,12 +1294,7 @@ def self.build_relats(model, parent = {}, seen = [])
     result = {:columns => model.attribute_names, :parent => parent}
     result[:reflections] = {}
 
-    refs = model.reflections_with_virtual
-    if model.try(:include_descendant_classes_in_expressions?)
-      model.descendants.each { |desc| refs.reverse_merge!(desc.reflections_with_virtual) }
-    end
-
-    refs.each do |assoc, ref|
+    model.reflections_with_virtual.each do |assoc, ref|
       next unless INCLUDE_TABLES.include?(assoc.to_s.pluralize)
       next if     assoc.to_s.pluralize == "event_logs" && parent[:root] == "Host" && !proto?
       next if     assoc.to_s.pluralize == "processes" && parent[:root] == "Host" # Process data not available yet for Host

spec/lib/miq_expression_spec.rb

@@ -2089,23 +2089,6 @@
     end
   end
 
-  context ".build_relats" do
-    it "includes reflections from descendant classes of Vm" do
-      relats = MiqExpression.get_relats(Vm)
-      expect(relats[:reflections][:cloud_tenant]).not_to be_blank
-    end
-
-    it "includes reflections from descendant classes of Host" do
-      relats = MiqExpression.get_relats(Host)
-      expect(relats[:reflections][:cloud_networks]).not_to be_blank
-    end
-
-    it "excludes reflections from descendant classes of VmOrTemplate " do
-      relats = MiqExpression.get_relats(VmOrTemplate)
-      expect(relats[:reflections][:cloud_tenant]).to be_blank
-    end
-  end
-
   describe "#to_human" do
     it "generates a human readable string for a 'FIELD' expression" do
       exp = MiqExpression.new(">" => {"field" => "Vm-allocated_disk_storage", "value" => "5.megabytes"})