Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move CinderManager inventory classes #282

Merged
merged 1 commit into from
Apr 27, 2018
Merged

Move CinderManager inventory classes #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/models/manageiq/providers/openstack/builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions app/models/manageiq/providers/openstack/inventory/collector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...llector/storage_manager/cinder_manager.rb → ...ack/inventory/collector/cinder_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions app/models/manageiq/providers/openstack/inventory/parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class ManageIQ::Providers::Openstack::Inventory::Parser < ManagerRefresh::Inventory::Parser
require_nested :CloudManager
require_nested :NetworkManager
require_nested :CinderManager
end
2 changes: 1 addition & 1 deletion .../parser/storage_manager/cinder_manager.rb → ...nstack/inventory/parser/cinder_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions app/models/manageiq/providers/openstack/inventory/persister.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rsister/storage_manager/cinder_manager.rb → ...ack/inventory/persister/cinder_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down