Fix StorageManagers Cross Linkers

Fix Cinder and Swift Cross Linkers to make sure valid data is available before processing. Cinder should have Volumes, Backups, or Snapshots. Swift must have Object Storage. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1441144.
jerryk55 · Apr 18, 2017 · 3c1c6b9 · 3c1c6b9
1 parent bfc8cfa
commit 3c1c6b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager/refresh_parser/cross_linkers.rb b/app/models/manageiq/providers/storage_manager/cinder_manager/refresh_parser/cross_linkers.rb
@@ -5,6 +5,10 @@ def self.cross_link(ems, data)
       _log.warn "Manager does not have a parent."
       return
     end
+    unless data
+      _log.warn "Manager does not have volumes, snapshots, or volume backups."
+      return
+    end
 
     parent_type = parent_manager.class.ems_type
     _log.debug "Parent type: #{parent_type}"

diff --git a/app/models/manageiq/providers/storage_manager/swift_manager/refresh_parser/cross_linkers.rb b/app/models/manageiq/providers/storage_manager/swift_manager/refresh_parser/cross_linkers.rb
@@ -5,6 +5,10 @@ def self.cross_link(ems, data)
       _log.warn "Manager does not have a parent."
       return
     end
+    unless data
+      _log.warn "Manager does not have any object storage."
+      return
+    end
 
     parent_type = parent_manager.class.ems_type
     _log.debug "Parent type: #{parent_type}"