Moving Inventory Builder functionality to Inventory

ManageIQ · Sep 6, 2018 · fd47ac4 · fd47ac4
1 parent 4984e9e
commit fd47ac4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 67 deletions.
diff --git a/app/models/manageiq/providers/openstack/builder.rb b/app/models/manageiq/providers/openstack/builder.rb
diff --git a/app/models/manageiq/providers/openstack/inventory.rb b/app/models/manageiq/providers/openstack/inventory.rb
@@ -2,4 +2,21 @@ class ManageIQ::Providers::Openstack::Inventory < ManageIQ::Providers::Inventory
   require_nested :Collector
   require_nested :Parser
   require_nested :Persister
+
+  # Default manager for building collector/parser/persister classes
+  # when failed to get class name from refresh target automatically
+  def self.default_manager_name
+    "CloudManager"
+  end
+
+  def self.parser_classes_for(_ems, target)
+    case target
+    when ManagerRefresh::TargetCollection
+      [ManageIQ::Providers::Openstack::Inventory::Parser::CloudManager,
+       ManageIQ::Providers::Openstack::Inventory::Parser::NetworkManager,
+       ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager::CinderManager]
+    else
+      super
+    end
+  end
 end
diff --git a/...ack/inventory/collector/cinder_manager.rb → ...llector/storage_manager/cinder_manager.rb b/...ack/inventory/collector/cinder_manager.rb → ...llector/storage_manager/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Collector::CinderManager < ManageIQ::Providers::Openstack::Inventory::Collector
+class ManageIQ::Providers::Openstack::Inventory::Collector::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Collector
   include ManageIQ::Providers::Openstack::Inventory::Collector::HelperMethods
 
   def cloud_volumes

diff --git a/...nstack/inventory/parser/cinder_manager.rb → .../parser/storage_manager/cinder_manager.rb b/...nstack/inventory/parser/cinder_manager.rb → .../parser/storage_manager/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Parser::CinderManager < ManageIQ::Providers::Openstack::Inventory::Parser
+class ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Parser
   def parse
     cloud_volumes
     cloud_volume_snapshots
@@ -63,7 +63,7 @@ def cloud_volume_types
       volume_type = persister.cloud_volume_types.find_or_build(t.id)
       volume_type.type = "ManageIQ::Providers::Openstack::CloudManager::CloudVolumeType"
       volume_type.name = t.name
-      unless t.extra_specs.blank?
+      if t.extra_specs.present?
         volume_type.backend_name = t.extra_specs["volume_backend_name"]
       end
       volume_type.description = t.attributes["description"]

diff --git a/...ack/inventory/persister/cinder_manager.rb → ...rsister/storage_manager/cinder_manager.rb b/...ack/inventory/persister/cinder_manager.rb → ...rsister/storage_manager/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Persister::CinderManager < ManageIQ::Providers::Openstack::Inventory::Persister
+class ManageIQ::Providers::Openstack::Inventory::Persister::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Persister
   include ManageIQ::Providers::Openstack::Inventory::Persister::Definitions::CloudCollections
   include ManageIQ::Providers::Openstack::Inventory::Persister::Definitions::NetworkCollections
   include ManageIQ::Providers::Openstack::Inventory::Persister::Definitions::StorageCollections