Merge pull request #417 from agrare/remove_legacy_refresh

Remove the option for legacy refresh from vCloud

app/models/manageiq/providers/vmware/cloud_manager.rb

@@ -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
@@ -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

app/models/manageiq/providers/vmware/cloud_manager/refresh_worker.rb

@@ -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

app/models/manageiq/providers/vmware/cloud_manager/refresher.rb

@@ -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)

app/models/manageiq/providers/vmware/inventory/collector.rb

@@ -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