Merge pull request #262 from aufi/default_empty_event_payload

Default Event payload to empty Hash (cherry picked from commit e62a44f) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1565167
ManageIQ · Apr 9, 2018 · 78966d4 · 78966d4
1 parent 00c9419
commit 78966d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/openstack/cloud_manager/event_parser.rb b/app/models/manageiq/providers/openstack/cloud_manager/event_parser.rb
@@ -2,7 +2,7 @@ module ManageIQ::Providers::Openstack::CloudManager::EventParser
   def self.event_to_hash(event, ems_id)
     content = message_content(event, ems_id)
     event_type = content["event_type"]
-    payload = content["payload"]
+    payload = content["payload"] || {}
 
     log_header = "ems_id: [#{ems_id}] " unless ems_id.nil?
     _log.debug("#{log_header}event: [#{event_type}]") if $log && $log.debug?

diff --git a/app/models/manageiq/providers/openstack/infra_manager/event_parser.rb b/app/models/manageiq/providers/openstack/infra_manager/event_parser.rb
@@ -2,7 +2,7 @@ module ManageIQ::Providers::Openstack::InfraManager::EventParser
   def self.event_to_hash(event, ems_id)
     content = message_content(event, ems_id)
     event_type = content["event_type"]
-    payload = content["payload"]
+    payload = content["payload"] || {}
 
     log_header = "ems_id: [#{ems_id}] " unless ems_id.nil?
     _log.debug("#{log_header}event: [#{event_type}]") if $log && $log.debug?

diff --git a/app/models/manageiq/providers/openstack/network_manager/event_parser.rb b/app/models/manageiq/providers/openstack/network_manager/event_parser.rb
@@ -2,7 +2,7 @@ module ManageIQ::Providers::Openstack::NetworkManager::EventParser
   def self.event_to_hash(event, ems_id)
     content = message_content(event, ems_id)
     event_type = content["event_type"]
-    payload = content["payload"]
+    payload = content["payload"] || {}
 
     log_header = "ems_id: [#{ems_id}] " unless ems_id.nil?
     _log.debug("#{log_header}event: [#{event_type}]") if $log && $log.debug?