Merge pull request #18041 from jrafanie/queue_reporting_work_for_any_…

…zone

Queue reporting work for any zone

(cherry picked from commit 65ef49c)

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

app/models/miq_queue.rb

@@ -197,14 +197,16 @@ def self.submit_job(options)
       # TODO: can we transition to zone = nil
     when "notifier"
       options[:role] = service
-      options[:zone] = nil # any zone
     when "reporting"
       options[:queue_name] = "generic"
       options[:role] = service
     when "smartproxy"
       options[:queue_name] = "smartproxy"
       options[:role] = "smartproxy"
     end
+
+    # Note, options[:zone] is set in 'put' via 'determine_queue_zone' and handles setting
+    # a nil (any) zone for regional roles.  Therefore, regional roles don't need to set zone here.
     put(options)
   end
 

app/models/miq_report/generator.rb

@@ -164,8 +164,8 @@ def queue_generate_table(options = {})
     if sync
       _async_generate_table(task.id, options)
     else
-      MiqQueue.put(
-        :queue_name  => "reporting",
+      MiqQueue.submit_job(
+        :service     => "reporting",
         :class_name  => self.class.name,
         :instance_id => id,
         :method_name => "_async_generate_table",
@@ -792,9 +792,8 @@ def queue_report_result(options, res_opts)
     _log.info("Adding generate report task to the message queue...")
     task = MiqTask.create(:name => "Generate Report: '#{name}'", :userid => options[:userid])
 
-    MiqQueue.put(
-      :queue_name  => "reporting",
-      :role        => "reporting",
+    MiqQueue.submit_job(
+      :service     => "reporting",
       :class_name  => self.class.name,
       :instance_id => id,
       :method_name => "build_report_result",

app/models/miq_report/generator/async.rb

@@ -55,7 +55,6 @@ def async_generate_table(options = {})
       if self.new_record?
         MiqQueue.submit_job(
           :service      => "reporting",
-          :role         => "reporting",
           :class_name   => self.class.to_s,
           :method_name  => "_async_generate_table",
           :args         => [task.id, self, options],

app/models/miq_widget.rb

@@ -108,6 +108,7 @@ def queue_generate_content_for_users_or_group(*args)
     MiqQueue.create_with(callback).put_unless_exists(
       :queue_name  => "reporting",
       :role        => "reporting",
+      :zone        => nil, # any zone
       :class_name  => self.class.to_s,
       :instance_id => id,
       :msg_timeout => 3600,

spec/models/miq_report/async_spec.rb

@@ -1,5 +1,38 @@
 describe MiqReport do
   context "Generator::Async" do
+    context ".async_generate_tables" do
+      let(:report) do
+        MiqReport.new(
+          :name      => "Custom VM report",
+          :title     => "Custom VM report",
+          :rpt_group => "Custom",
+          :rpt_type  => "Custom",
+          :db        => "ManageIQ::Providers::InfraManager::Vm",
+        )
+      end
+
+      it "creates task, queue, audit event" do
+        User.seed
+        EvmSpecHelper.local_miq_server
+        ServerRole.seed
+        expect(AuditEvent).to receive(:success)
+
+        described_class.async_generate_tables(:reports => [report])
+        task = MiqTask.first
+        expect(task.name).to eq("Generate Reports: [\"#{report.name}\"]")
+
+        message = MiqQueue.find_by(:method_name => "_async_generate_tables")
+        expect(message).to have_attributes(
+          :role        => "reporting",
+          :zone        => nil,
+          :class_name  => report.class.name,
+          :method_name => "_async_generate_tables"
+        )
+
+        expect(message.args.first).to eq(task.id)
+      end
+    end
+
     context "._async_generate_tables" do
       it "unknown taskid" do
         expect { MiqReport._async_generate_tables(111111, :reports => []) }.to raise_error(MiqException::Error)

spec/models/miq_report/generator_spec.rb

@@ -76,6 +76,63 @@ def create_rollup(host, profile, used_mem)
     end
   end
 
+  describe "creates task, queue, audit event" do
+    let(:report) do
+      MiqReport.new(
+        :name      => "Custom VM report",
+        :title     => "Custom VM report",
+        :rpt_group => "Custom",
+        :rpt_type  => "Custom",
+        :db        => "ManageIQ::Providers::InfraManager::Vm",
+      )
+    end
+
+    before do
+      User.seed
+      EvmSpecHelper.local_miq_server
+      ServerRole.seed
+      expect(AuditEvent).to receive(:success)
+    end
+
+    it "#queue_generate_table" do
+      report.queue_generate_table(:userid => "admin")
+      task = MiqTask.first
+      expect(task).to have_attributes(
+        :name   => "Generate Report: '#{report.name}'",
+        :userid => "admin"
+      )
+
+      message = MiqQueue.find_by(:method_name => "_async_generate_table")
+      expect(message).to have_attributes(
+        :role        => "reporting",
+        :zone        => nil,
+        :class_name  => report.class.name,
+        :method_name => "_async_generate_table"
+      )
+
+      expect(message.args.first).to eq(task.id)
+    end
+
+    it "#queue_report_result" do
+      task_id = report.queue_report_result({:userid => "admin"}, {})
+      task = MiqTask.find(task_id)
+      expect(task).to have_attributes(
+        :name   => "Generate Report: '#{report.name}'",
+        :userid => "admin"
+      )
+
+      message = MiqQueue.find_by(:method_name => "build_report_result")
+      expect(message).to have_attributes(
+        :role        => "reporting",
+        :zone        => nil,
+        :class_name  => report.class.name,
+        :method_name => "build_report_result"
+      )
+
+      expect(message.args.first).to eq(task_id)
+    end
+  end
+
   describe "#cols_for_report" do
     it "uses cols" do
       rpt = MiqReport.new(:db => "VmOrTemplate", :cols => %w(vendor version name))

spec/models/miq_widget_spec.rb

@@ -273,6 +273,7 @@ def add_dashboard_for_user(db_name, userid, group)
 
       @q_options = {:queue_name  => "reporting",
                     :role        => "reporting",
+                    :zone        => nil,
                     :class_name  => @widget.class.name,
                     :instance_id => @widget.id,
                     :msg_timeout => 3600