Merge pull request #282 from mansam/move-cinder-manager-inventory-cla…

…sses Move CinderManager inventory classes
ManageIQ · Apr 27, 2018 · c691435 · c691435
2 parents a95440e + 08ae743
commit c691435
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/app/models/manageiq/providers/openstack/builder.rb b/app/models/manageiq/providers/openstack/builder.rb
@@ -8,9 +8,9 @@ def build_inventory(ems, target)
         inventory(
           ems,
           target,
-          ManageIQ::Providers::Openstack::Inventory::Collector::StorageManager::CinderManager,
-          ManageIQ::Providers::Openstack::Inventory::Persister::StorageManager::CinderManager,
-          [ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager::CinderManager]
+          ManageIQ::Providers::Openstack::Inventory::Collector::CinderManager,
+          ManageIQ::Providers::Openstack::Inventory::Persister::CinderManager,
+          [ManageIQ::Providers::Openstack::Inventory::Parser::CinderManager]
         )
       when ManageIQ::Providers::Openstack::NetworkManager
         inventory(
@@ -28,7 +28,7 @@ def build_inventory(ems, target)
           ManageIQ::Providers::Openstack::Inventory::Persister::TargetCollection,
           [ManageIQ::Providers::Openstack::Inventory::Parser::CloudManager,
            ManageIQ::Providers::Openstack::Inventory::Parser::NetworkManager,
-           ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager::CinderManager]
+           ManageIQ::Providers::Openstack::Inventory::Parser::CinderManager]
         )
       else
         # Fallback to ems refresh

diff --git a/app/models/manageiq/providers/openstack/inventory/collector.rb b/app/models/manageiq/providers/openstack/inventory/collector.rb
@@ -4,6 +4,7 @@ class ManageIQ::Providers::Openstack::Inventory::Collector < ManagerRefresh::Inv
 
   require_nested :CloudManager
   require_nested :NetworkManager
+  require_nested :CinderManager
   require_nested :TargetCollection
 
   attr_reader :availability_zones

diff --git a/...llector/storage_manager/cinder_manager.rb → ...ack/inventory/collector/cinder_manager.rb b/...llector/storage_manager/cinder_manager.rb → ...ack/inventory/collector/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Collector::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Collector
+class ManageIQ::Providers::Openstack::Inventory::Collector::CinderManager < ManageIQ::Providers::Openstack::Inventory::Collector
   include ManageIQ::Providers::Openstack::Inventory::Collector::HelperMethods
 
   def cloud_volumes

diff --git a/app/models/manageiq/providers/openstack/inventory/parser.rb b/app/models/manageiq/providers/openstack/inventory/parser.rb
@@ -1,4 +1,5 @@
 class ManageIQ::Providers::Openstack::Inventory::Parser < ManagerRefresh::Inventory::Parser
   require_nested :CloudManager
   require_nested :NetworkManager
+  require_nested :CinderManager
 end
diff --git a/.../parser/storage_manager/cinder_manager.rb → ...nstack/inventory/parser/cinder_manager.rb b/.../parser/storage_manager/cinder_manager.rb → ...nstack/inventory/parser/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Parser::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Parser
+class ManageIQ::Providers::Openstack::Inventory::Parser::CinderManager < ManageIQ::Providers::Openstack::Inventory::Parser
   def parse
     cloud_volumes
     cloud_volume_snapshots

diff --git a/app/models/manageiq/providers/openstack/inventory/persister.rb b/app/models/manageiq/providers/openstack/inventory/persister.rb
@@ -1,6 +1,7 @@
 class ManageIQ::Providers::Openstack::Inventory::Persister < ManagerRefresh::Inventory::Persister
   require_nested :CloudManager
   require_nested :NetworkManager
+  require_nested :CinderManager
   require_nested :TargetCollection
 
   # TODO(lsmola) figure out a way to pass collector info, probably via target, then remove the below

diff --git a/...rsister/storage_manager/cinder_manager.rb → ...ack/inventory/persister/cinder_manager.rb b/...rsister/storage_manager/cinder_manager.rb → ...ack/inventory/persister/cinder_manager.rb
@@ -1,4 +1,4 @@
-class ManageIQ::Providers::Openstack::Inventory::Persister::StorageManager::CinderManager < ManageIQ::Providers::Openstack::Inventory::Persister
+class ManageIQ::Providers::Openstack::Inventory::Persister::CinderManager < ManageIQ::Providers::Openstack::Inventory::Persister
   def initialize_inventory_collections
     add_inventory_collections(storage,
                               %i(