Remove the option for legacy refresh from vCloud

Remove the setting to allow for legacy refresh in vCloud and delete the old parsers.
ManageIQ · Dec 4, 2019 · b4cbe30 · b4cbe30
1 parent 3133532
commit b4cbe30
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 966 deletions.
diff --git a/app/models/manageiq/providers/vmware/cloud_manager.rb b/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

diff --git a/app/models/manageiq/providers/vmware/cloud_manager/refresh_parser.rb b/app/models/manageiq/providers/vmware/cloud_manager/refresh_parser.rb
diff --git a/app/models/manageiq/providers/vmware/cloud_manager/refresher.rb b/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)

diff --git a/app/models/manageiq/providers/vmware/network_manager.rb b/app/models/manageiq/providers/vmware/network_manager.rb
@@ -2,7 +2,6 @@ class ManageIQ::Providers::Vmware::NetworkManager < ManageIQ::Providers::Network
   require_nested :CloudNetwork
   require_nested :CloudSubnet
   require_nested :NetworkPort
-  require_nested :RefreshParser
   require_nested :RefreshWorker
   require_nested :Refresher
 
@@ -42,4 +41,8 @@ def self.hostname_required?
   def description
     @description ||= "VMware Cloud Network".freeze
   end
+
+  def inventory_object_refresh?
+    true
+  end
 end