From 798975c4589d99c2b8fc31fb6baad590fd359911 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Thu, 14 Jun 2018 14:33:42 -0400 Subject: [PATCH] Remove useless EmsRefresherMixin The EmsRefresherMixin was moved to the BaseManager::Refresher in https://github.com/ManageIQ/manageiq/pull/17472 --- app/models/ems_refresh/refreshers/ems_refresher_mixin.rb | 6 ------ .../manageiq/providers/base_manager/manager_refresher.rb | 2 -- .../embedded_ansible/automation_manager/refresher.rb | 1 - .../providers/storage_manager/cinder_manager/refresher.rb | 2 -- .../providers/storage_manager/swift_manager/refresher.rb | 2 -- .../providers/%provider_name%/cloud_manager/refresher.rb | 1 - 6 files changed, 14 deletions(-) delete mode 100644 app/models/ems_refresh/refreshers/ems_refresher_mixin.rb diff --git a/app/models/ems_refresh/refreshers/ems_refresher_mixin.rb b/app/models/ems_refresh/refreshers/ems_refresher_mixin.rb deleted file mode 100644 index 8ca9532a2b9..00000000000 --- a/app/models/ems_refresh/refreshers/ems_refresher_mixin.rb +++ /dev/null @@ -1,6 +0,0 @@ -module EmsRefresh - module Refreshers - module EmsRefresherMixin - end - end -end diff --git a/app/models/manageiq/providers/base_manager/manager_refresher.rb b/app/models/manageiq/providers/base_manager/manager_refresher.rb index 113ea5b2bb3..5da3d0818c1 100644 --- a/app/models/manageiq/providers/base_manager/manager_refresher.rb +++ b/app/models/manageiq/providers/base_manager/manager_refresher.rb @@ -1,8 +1,6 @@ module ManageIQ module Providers class BaseManager::ManagerRefresher < ManageIQ::Providers::BaseManager::Refresher - include ::EmsRefresh::Refreshers::EmsRefresherMixin - # Gives a Builder class for Inventory # @param klass [Class] Class of used ManageIQ::Providers::BaseManager object # @return [ManageIQ::Providers::::Builder] Builder class for Inventory diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/refresher.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/refresher.rb index 4ec2e33a5c4..dca3587d538 100644 --- a/app/models/manageiq/providers/embedded_ansible/automation_manager/refresher.rb +++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/refresher.rb @@ -1,5 +1,4 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Refresher < ManageIQ::Providers::BaseManager::Refresher - include ::EmsRefresh::Refreshers::EmsRefresherMixin include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::Refresher def self.display_name(number = 1) diff --git a/app/models/manageiq/providers/storage_manager/cinder_manager/refresher.rb b/app/models/manageiq/providers/storage_manager/cinder_manager/refresher.rb index ba2dc3ad23b..7da738aef68 100644 --- a/app/models/manageiq/providers/storage_manager/cinder_manager/refresher.rb +++ b/app/models/manageiq/providers/storage_manager/cinder_manager/refresher.rb @@ -1,8 +1,6 @@ # module ManageIQ::Providers class StorageManager::CinderManager::Refresher < ManageIQ::Providers::BaseManager::Refresher - include ::EmsRefresh::Refreshers::EmsRefresherMixin - def parse_legacy_inventory(ems) ManageIQ::Providers::StorageManager::CinderManager::RefreshParser.ems_inv_to_hashes(ems, refresher_options) end diff --git a/app/models/manageiq/providers/storage_manager/swift_manager/refresher.rb b/app/models/manageiq/providers/storage_manager/swift_manager/refresher.rb index 7b47ef1d971..225d9a6f29f 100644 --- a/app/models/manageiq/providers/storage_manager/swift_manager/refresher.rb +++ b/app/models/manageiq/providers/storage_manager/swift_manager/refresher.rb @@ -1,7 +1,5 @@ module ManageIQ::Providers class StorageManager::SwiftManager::Refresher < ManageIQ::Providers::BaseManager::Refresher - include ::EmsRefresh::Refreshers::EmsRefresherMixin - def parse_legacy_inventory(ems) ManageIQ::Providers::StorageManager::SwiftManager::RefreshParser.ems_inv_to_hashes(ems, refresher_options) end diff --git a/lib/generators/provider/templates/app/models/manageiq/providers/%provider_name%/cloud_manager/refresher.rb b/lib/generators/provider/templates/app/models/manageiq/providers/%provider_name%/cloud_manager/refresher.rb index 5e753ca1939..fa720378331 100644 --- a/lib/generators/provider/templates/app/models/manageiq/providers/%provider_name%/cloud_manager/refresher.rb +++ b/lib/generators/provider/templates/app/models/manageiq/providers/%provider_name%/cloud_manager/refresher.rb @@ -1,3 +1,2 @@ class ManageIQ::Providers::<%= class_name %>::CloudManager::Refresher < ManageIQ::Providers::BaseManager::Refresher - include ::EmsRefresh::Refreshers::EmsRefresherMixin end