Skip to content

Commit c428008

Browse files
agrareagrare
authored
Merge pull request #482 from jrafanie/drop_require_nested_include_concern
Drop require_nested and include_concern
2 parents fbf6db2 + 0d68b78 commit c428008

39 files changed

+13
-170
lines changed

‎app/models/manageiq/providers/ibm_cloud/container_manager.rb

-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
ManageIQ::Providers::Kubernetes::ContainerManager.include(ActsAsStiLeafClass)
22

33
class ManageIQ::Providers::IbmCloud::ContainerManager < ManageIQ::Providers::Kubernetes::ContainerManager
4-
require_nested :Container
5-
require_nested :ContainerGroup
6-
require_nested :ContainerNode
7-
require_nested :ContainerTemplate
8-
require_nested :EventCatcher
9-
require_nested :EventParser
10-
require_nested :MetricsCapture
11-
require_nested :MetricsCollectorWorker
12-
require_nested :Refresher
13-
require_nested :RefreshWorker
14-
require_nested :ServiceInstance
15-
require_nested :ServiceOffering
16-
require_nested :ServiceParametersSet
17-
184
supports :create
195

206
METRICS_ROLES = %w[prometheus].freeze

‎app/models/manageiq/providers/ibm_cloud/container_manager/event_catcher.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ContainerManager::EventCatcher < ManageIQ::Providers::BaseManager::EventCatcher
2-
require_nested :Runner
3-
42
def self.settings_name
53
:event_catcher_ibm_cloud_iks
64
end

‎app/models/manageiq/providers/ibm_cloud/container_manager/metrics_capture.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ContainerManager::MetricsCapture < ManageIQ::Providers::Kubernetes::ContainerManager::MetricsCapture
2-
require_nested :PrometheusCaptureContext
3-
42
def prometheus_capture_context(target, start_time, end_time)
53
ManageIQ::Providers::IbmCloud::ContainerManager::MetricsCapture::PrometheusCaptureContext.new(target, start_time, end_time, INTERVAL)
64
end

‎app/models/manageiq/providers/ibm_cloud/container_manager/metrics_collector_worker.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ContainerManager::MetricsCollectorWorker < ManageIQ::Providers::BaseManager::MetricsCollectorWorker
2-
require_nested :Runner
3-
42
self.default_queue_name = "iks"
53

64
def friendly_name

‎app/models/manageiq/providers/ibm_cloud/container_manager/refresh_worker.rb

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ContainerManager::RefreshWorker < ManageIQ::Providers::BaseManager::RefreshWorker
2-
require_nested :Runner
3-
require_nested :WatchThread
4-
52
def self.settings_name
63
:ems_refresh_worker_ibm_cloud_iks
74
end

‎app/models/manageiq/providers/ibm_cloud/inventory.rb

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory < ManageIQ::Providers::Inventory
2-
require_nested :Collector
3-
require_nested :Parser
4-
require_nested :Persister
5-
62
def self.parsed_manager_name(ems, target)
73
case target
84
when InventoryRefresh::TargetCollection

‎app/models/manageiq/providers/ibm_cloud/inventory/collector.rb

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Collector < ManageIQ::Providers::Inventory::Collector
2-
require_nested :ContainerManager
3-
require_nested :ObjectStorage
4-
require_nested :PowerVirtualServers
5-
require_nested :VPC
62
end

‎app/models/manageiq/providers/ibm_cloud/inventory/collector/container_manager.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Collector::ContainerManager < ManageIQ::Providers::Kubernetes::Inventory::Collector::ContainerManager
2-
require_nested :WatchNotice
32
end

‎app/models/manageiq/providers/ibm_cloud/inventory/collector/object_storage.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Collector::ObjectStorage < ManageIQ::Providers::IbmCloud::Inventory::Collector
2-
require_nested :StorageManager
3-
42
BUCKET_TAB_LIMIT = 1000
53

64
def buckets

‎app/models/manageiq/providers/ibm_cloud/inventory/collector/power_virtual_servers.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Collector::PowerVirtualServers < ManageIQ::Providers::IbmCloud::Inventory::Collector
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
def collect
83
connection
94
end

‎app/models/manageiq/providers/ibm_cloud/inventory/collector/vpc.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Collector::VPC < ManageIQ::Providers::IbmCloud::Inventory::Collector
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
def connection
83
@connection ||= manager.connect
94
end

‎app/models/manageiq/providers/ibm_cloud/inventory/parser.rb

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Parser < ManageIQ::Providers::Inventory::Parser
2-
require_nested :ContainerManager
3-
require_nested :ObjectStorage
4-
require_nested :PowerVirtualServers
5-
require_nested :VPC
62
end

‎app/models/manageiq/providers/ibm_cloud/inventory/parser/container_manager.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Parser::ContainerManager < ManageIQ::Providers::Kubernetes::Inventory::Parser::ContainerManager
2-
require_nested :WatchNotice
32
end

‎app/models/manageiq/providers/ibm_cloud/inventory/parser/object_storage.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Parser::ObjectStorage < ManageIQ::Providers::IbmCloud::Inventory::Parser
2-
require_nested :StorageManager
3-
42
BUCKET_TAB_LIMIT = 1000
53

64
def parse

‎app/models/manageiq/providers/ibm_cloud/inventory/parser/power_virtual_servers.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Parser::PowerVirtualServers < ManageIQ::Providers::IbmCloud::Inventory::Parser
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
attr_reader :subnet_to_ext_ports
83

94
OS_MIQ_NAMES_MAP = {

‎app/models/manageiq/providers/ibm_cloud/inventory/parser/vpc.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Parser::VPC < ManageIQ::Providers::IbmCloud::Inventory::Parser
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
def parse
83
floating_ips
94
cloud_databases

‎app/models/manageiq/providers/ibm_cloud/inventory/persister.rb

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Persister < ManageIQ::Providers::Inventory::Persister
2-
require_nested :ContainerManager
3-
require_nested :ObjectStorage
4-
require_nested :PowerVirtualServers
5-
require_nested :VPC
62
end

‎app/models/manageiq/providers/ibm_cloud/inventory/persister/container_manager.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Persister::ContainerManager < ManageIQ::Providers::Kubernetes::Inventory::Persister::ContainerManager
2-
require_nested :WatchNotice
32
end

‎app/models/manageiq/providers/ibm_cloud/inventory/persister/object_storage.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Persister::ObjectStorage < ManageIQ::Providers::IbmCloud::Inventory::Persister
2-
require_nested :StorageManager
3-
42
def initialize_inventory_collections
53
add_collection(storage, :cloud_object_store_objects) do |builder|
64
builder.add_properties(:model_class => ManageIQ::Providers::IbmCloud::ObjectStorage::StorageManager::CloudObjectStoreObject)

‎app/models/manageiq/providers/ibm_cloud/inventory/persister/power_virtual_servers.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Persister::PowerVirtualServers < ManageIQ::Providers::IbmCloud::Inventory::Persister
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
def initialize_inventory_collections
83
initialize_cloud_inventory_collections
94
initialize_network_inventory_collections

‎app/models/manageiq/providers/ibm_cloud/inventory/persister/vpc.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::Inventory::Persister::VPC < ManageIQ::Providers::IbmCloud::Inventory::Persister
2-
require_nested :CloudManager
3-
require_nested :NetworkManager
4-
require_nested :StorageManager
5-
require_nested :TargetCollection
6-
72
def self.provider_module
83
"ManageIQ::Providers::IbmCloud::VPC"
94
end

‎app/models/manageiq/providers/ibm_cloud/object_storage/storage_manager.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ObjectStorage::StorageManager < ManageIQ::Providers::StorageManager
2-
require_nested :CloudObjectStoreContainer
3-
require_nested :CloudObjectStoreObject
4-
require_nested :Refresher
5-
require_nested :RefreshWorker
6-
72
supports :create
83
supports :update
94

‎app/models/manageiq/providers/ibm_cloud/object_storage/storage_manager/refresh_worker.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::ObjectStorage::StorageManager::RefreshWorker < MiqEmsRefreshWorker
2-
require_nested :Runner
3-
42
def self.settings_name
53
:ems_refresh_worker_ibm_cloud_object_storage
64
end

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager.rb

-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager < ManageIQ::Providers::CloudManager
2-
require_nested :AuthKeyPair
3-
require_nested :AvailabilityZone
4-
require_nested :EventCatcher
5-
require_nested :Flavor
6-
require_nested :Refresher
7-
require_nested :RefreshWorker
8-
require_nested :PlacementGroup
9-
require_nested :Provision
10-
require_nested :ProvisionWorkflow
11-
require_nested :SAPProfile
12-
require_nested :Snapshot
13-
require_nested :Template
14-
require_nested :Vm
15-
require_nested :ResourcePool
16-
172
include ManageIQ::Providers::IbmCloud::PowerVirtualServers::ManagerMixin
183

194
delegate :cloud_volumes,

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/event_catcher.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::EventCatcher < ManageIQ::Providers::BaseManager::EventCatcher
2-
require_nested :Runner
3-
42
def self.settings_name
53
:event_catcher_ibm_cloud_power_virtual_servers
64
end

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/provision.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::Provision < ::MiqProvisionCloud
2-
include_concern 'Cloning'
3-
include_concern 'StateMachine'
4-
include_concern 'OptionsHelper'
2+
include Cloning
3+
include StateMachine
4+
include OptionsHelper
55

66
def destination_type
77
case request_type

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/refresh_worker.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::RefreshWorker < MiqEmsRefreshWorker
2-
require_nested :Runner
3-
42
def self.settings_name
53
:ems_refresh_worker_ibm_cloud_power_virtual_servers
64
end

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/cloud_manager/vm.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::Vm < ManageIQ::Providers::CloudManager::Vm
2-
include_concern 'Operations'
2+
include Operations
33

44
supports :capture
55
supports :terminate

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/network_manager.rb

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::NetworkManager < ManageIQ::Providers::NetworkManager
2-
require_nested :Refresher
3-
require_nested :CloudNetwork
4-
require_nested :CloudSubnet
5-
require_nested :LoadBalancer
6-
require_nested :NetworkPort
7-
require_nested :NetworkRouter
8-
require_nested :SecurityGroup
9-
102
include ManageIQ::Providers::IbmCloud::PowerVirtualServers::ManagerMixin
113

124
supports :cloud_subnet_create

‎app/models/manageiq/providers/ibm_cloud/power_virtual_servers/storage_manager.rb

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::PowerVirtualServers::StorageManager < ManageIQ::Providers::StorageManager
2-
require_nested :CloudVolume
3-
require_nested :CloudVolumeType
4-
require_nested :Refresher
5-
62
include ManageIQ::Providers::IbmCloud::PowerVirtualServers::ManagerMixin
73
include ManageIQ::Providers::StorageManager::BlockMixin
84

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager.rb

-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::VPC::CloudManager < ManageIQ::Providers::CloudManager
2-
require_nested :AuthKeyPair
3-
require_nested :AvailabilityZone
4-
require_nested :CloudDatabase
5-
require_nested :CloudDatabaseFlavor
6-
require_nested :EventCatcher
7-
require_nested :Flavor
8-
require_nested :LoggingMixin
9-
require_nested :MetricsCapture
10-
require_nested :MetricsCollectorWorker
11-
require_nested :Provision
12-
require_nested :ProvisionWorkflow
13-
require_nested :RefreshWorker
14-
require_nested :Refresher
15-
require_nested :Template
16-
require_nested :Vm
17-
182
supports :create
193
supports :metrics
204
supports :catalog

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/event_catcher.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::EventCatcher < ManageIQ::Providers::BaseManager::EventCatcher
2-
require_nested :Runner
3-
42
def self.all_valid_ems_in_zone
53
super.select do |ems|
64
ems.authentication_key("events").present? && ems.authentication_status_ok?(:events)

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/metrics_collector_worker.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::MetricsCollectorWorker < ManageIQ::Providers::BaseManager::MetricsCollectorWorker
2-
require_nested :Runner
3-
42
self.default_queue_name = "ibm_cloud_vpc"
53

64
def friendly_name

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/provision.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# Opts into CloudManager provisioning. Custom logic is separated into module mixins.
44
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::Provision < ::MiqProvisionCloud
55
include ManageIQ::Providers::IbmCloud::VPC::CloudManager::LoggingMixin # Standardise the logging.
6-
7-
include_concern 'Cloning' # Actual provision to cloud.
8-
include_concern 'Payload' # Create json payload.
9-
include_concern 'StateMachine' # Pre-provision tasks.
6+
include Cloning # Actual provision to cloud.
7+
include Payload # Create json payload.
8+
include StateMachine # Pre-provision tasks.
109
end

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/provision_workflow.rb

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
# Class contains all logic used to populate the UI.
44
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::ProvisionWorkflow < ::MiqProvisionCloudWorkflow
55
include ManageIQ::Providers::IbmCloud::VPC::CloudManager::LoggingMixin # Standardise the logging.
6-
7-
include_concern 'Common' # Provides common functionality.
8-
include_concern 'General' # Used for general options.
9-
include_concern 'Network' # Used for network options.
10-
include_concern 'Volumes' # Used for volume options.
11-
include_concern 'Fields' # Used for manipulating field hashes.
6+
include Common # Provides common functionality.
7+
include General # Used for general options.
8+
include Network # Used for network options.
9+
include Volumes # Used for volume options.
10+
include Fields # Used for manipulating field hashes.
1211

1312
# Class methods. Do not move to sub module.
1413
class << self

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/refresh_worker.rb

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::RefreshWorker < MiqEmsRefreshWorker
2-
require_nested :Runner
3-
42
def self.settings_name
53
:ems_refresh_worker_ibm_cloud_vpc
64
end

‎app/models/manageiq/providers/ibm_cloud/vpc/cloud_manager/template.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Provide CloudManager support for IBM CLoud VPC templates.
44
class ManageIQ::Providers::IbmCloud::VPC::CloudManager::Template < ManageIQ::Providers::CloudManager::Template
5-
include_concern 'ManageIQ::Providers::IbmCloud::VPC::CloudManager::VmOrTemplateShared'
5+
include ManageIQ::Providers::IbmCloud::VPC::CloudManager::VmOrTemplateShared
66

77
supports :provisioning do
88
if ext_management_system

‎app/models/manageiq/providers/ibm_cloud/vpc/network_manager.rb

-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
class ManageIQ::Providers::IbmCloud::VPC::NetworkManager < ManageIQ::Providers::NetworkManager
2-
require_nested :CloudNetwork
3-
require_nested :CloudSubnet
4-
require_nested :FloatingIp
5-
require_nested :LoadBalancer
6-
require_nested :LoadBalancerHealthCheck
7-
require_nested :LoadBalancerListener
8-
require_nested :LoadBalancerPool
9-
require_nested :LoadBalancerPoolMember
10-
require_nested :NetworkPort
11-
require_nested :NetworkRouter
12-
require_nested :Refresher
13-
require_nested :SecurityGroup
14-
152
include ManageIQ::Providers::IbmCloud::VPC::ManagerMixin
163

174
supports :cloud_subnet_create

‎app/models/manageiq/providers/ibm_cloud/vpc/storage_manager.rb

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ class ManageIQ::Providers::IbmCloud::VPC::StorageManager < ManageIQ::Providers::
22
include ManageIQ::Providers::IbmCloud::VPC::ManagerMixin
33
include ManageIQ::Providers::StorageManager::BlockMixin
44

5-
require_nested :CloudVolume
6-
require_nested :CloudVolumeType
7-
require_nested :Refresher
8-
95
delegate :authentication_check,
106
:authentication_status,
117
:authentication_status_ok?,

0 commit comments

Comments
 (0)