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

Jump to bottom

Remove the option for legacy refresh from vCloud #417

Merged
merged 5 commits into from
Dec 5, 2019
Merged

Remove the option for legacy refresh from vCloud #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4cbe30
Remove the option for legacy refresh from vCloud
agrare Jul 25, 2019
eaffc3c
Use combined managers for vCloud
agrare Dec 4, 2019
d983b93
Scaffolding for network manager graph refresh
agrare Dec 4, 2019
257ac9f
Graph refresh for NetworkManager
agrare Dec 4, 2019
ad90721
Fix copy&paste error
agrare Dec 5, 2019
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
5 changes: 4 additions & 1 deletion app/models/manageiq/providers/vmware/cloud_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class ManageIQ::Providers::Vmware::CloudManager < ManageIQ::Providers::CloudMana
require_nested :OrchestrationTemplate
require_nested :EventCatcher
require_nested :EventParser
require_nested :RefreshParser
require_nested :RefreshWorker
require_nested :Refresher
require_nested :Template
Expand Down Expand Up @@ -148,6 +147,10 @@ def supported_catalog_types
%w(vmware)
end

def inventory_object_refresh?
true
end

def self.display_name(number = 1)
n_('Cloud Provider (VMware vCloud)', 'Cloud Providers (VMware vCloud)', number)
end
Expand Down
271 changes: 0 additions & 271 deletions app/models/manageiq/providers/vmware/cloud_manager/refresh_parser.rb
View file
Open in desktop

This file was deleted.

25 changes: 23 additions & 2 deletions app/models/manageiq/providers/vmware/cloud_manager/refresh_worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
class ManageIQ::Providers::Vmware::CloudManager::RefreshWorker < ManageIQ::Providers::BaseManager::RefreshWorker
require_nested :Runner

def self.settings_name
:ems_refresh_worker_vmware_cloud
# overriding queue_name_for_ems so PerEmsWorkerMixin picks up *all* of the
# manager types from here.
# This way, the refresher for Vmware's CloudManager will refresh *all*
# of the vCloud inventory across all managers.
class << self
def settings_name
:ems_refresh_worker_vmware_cloud
end

def queue_name_for_ems(ems)
return ems unless ems.kind_of?(ExtManagementSystem)
combined_managers(ems).collect(&:queue_name).sort
end

private

def combined_managers(ems)
[ems].concat(ems.child_managers)
end
end

# MiQ complains if this isn't defined
def queue_name_for_ems(ems)
end
end
4 changes: 0 additions & 4 deletions app/models/manageiq/providers/vmware/cloud_manager/refresher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
class ManageIQ::Providers::Vmware::CloudManager::Refresher < ManageIQ::Providers::BaseManager::Refresher
def parse_legacy_inventory(ems)
ManageIQ::Providers::Vmware::CloudManager::RefreshParser.ems_inv_to_hashes(ems, refresher_options)
end

def save_inventory(ems, target, hashes)
super
EmsRefresh.queue_refresh(ems.network_manager)
Expand Down
1 change: 1 addition & 0 deletions app/models/manageiq/providers/vmware/inventory/collector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class ManageIQ::Providers::Vmware::Inventory::Collector < ManageIQ::Providers::Inventory::Collector
require_nested :CloudManager
require_nested :NetworkManager

def initialize(_manager, _target)
super
Expand Down
Loading