Merge pull request #20179 from agrare/add_ems_uid_and_type_to_event_p…

…ayload Add ems_uid and ems_type to event payload (cherry picked from commit 5d73337)
ManageIQ · May 21, 2020 · 5805d5c · 5805d5c
1 parent 4247cba
commit 5805d5c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/app/models/ems_event.rb b/app/models/ems_event.rb
@@ -25,14 +25,7 @@ def self.bottleneck_event_groups
   end
 
   def self.add_queue(meth, ems_id, event)
-    unless MiqQueue.messaging_type == "miq_queue"
-      MiqQueue.messaging_client('event_handler')&.publish_topic(
-        :service => "manageiq.ems-events",
-        :sender  => ems_id,
-        :event   => event[:event_type],
-        :payload => event
-      )
-    end
+    publish_event(ems_id, event)
 
     MiqQueue.submit_job(
       :service     => "event",
@@ -258,6 +251,23 @@ def self.create_completed_event(event, orig_task = nil)
 
   private_class_method :create_completed_event
 
+  def self.publish_event(ems_id, event)
+    return if MiqQueue.messaging_type == "miq_queue"
+
+    ems = ExtManagementSystem.find(ems_id)
+    event[:ems_uid]  = ems&.uid_ems
+    event[:ems_type] = ems&.class&.ems_type
+
+    MiqQueue.messaging_client('event_handler')&.publish_topic(
+      :service => "manageiq.ems-events",
+      :sender  => ems_id,
+      :event   => event[:event_type],
+      :payload => event
+    )
+  end
+
+  private_class_method :publish_event
+
   def get_refresh_target(target_type)
     m = "#{target_type}_refresh_target"
     try(m)

diff --git a/spec/models/ems_event_spec.rb b/spec/models/ems_event_spec.rb
@@ -130,7 +130,10 @@
             :service => "manageiq.ems-events",
             :sender  => ems.id,
             :event   => event_hash[:event_type],
-            :payload => event_hash,
+            :payload => event_hash.merge(
+              :ems_type => ems.class.ems_type,
+              :ems_uid  => ems.uid_ems
+            )
           }
 
           expect(messaging_client).to receive(:publish_topic).with(expected_queue_payload)
@@ -150,7 +153,10 @@
             :service => "manageiq.ems-events",
             :sender  => ems.id,
             :event   => event_hash[:event_type],
-            :payload => event_hash,
+            :payload => event_hash.merge(
+              :ems_type => ems.class.ems_type,
+              :ems_uid  => ems.uid_ems
+            )
           }
 
           expect(messaging_client).to receive(:publish_topic).with(expected_queue_payload)