feat: Add Zeitwerk loader support (theforeman#355)

ATIX-AG · Oct 2, 2024 · c237bc0 · c237bc0
1 parent 00db43f
commit c237bc0
Show file tree

Hide file tree

Showing 37 changed files with 82 additions and 87 deletions.
diff --git a/app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb b/app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb
@@ -24,7 +24,7 @@ module HostsController
       prepend Overrides
     end
     module Overrides
-      include ForemanFogProxmox::ProxmoxVmNew
+      include ForemanFogProxmox::ProxmoxVMNew
       # Clone the host
       def clone
         super

diff --git a/app/helpers/proxmox_vm_attrs_helper.rb b/app/helpers/proxmox_vm_attrs_helper.rb
@@ -24,7 +24,7 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmAttrsHelper
+module ProxmoxVMAttrsHelper
   def object_to_attributes_hash(vms, from_profile, start_checked)
     param_scope = from_profile ? "compute_attribute[vm_attrs]" : "host[compute_attributes]"
     vm_h = ActiveSupport::HashWithIndifferentAccess.new

diff --git a/app/helpers/proxmox_vm_cdrom_helper.rb b/app/helpers/proxmox_vm_cdrom_helper.rb
@@ -23,7 +23,7 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmCdromHelper
+module ProxmoxVMCdromHelper
   def parse_server_cdrom(args)
     cdrom_media = args['cdrom'] if args.key?('cdrom')
     cdrom_image = args['volid'] if args.key?('volid')

diff --git a/app/helpers/proxmox_vm_cloudinit_helper.rb b/app/helpers/proxmox_vm_cloudinit_helper.rb
@@ -23,7 +23,7 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmCloudinitHelper
+module ProxmoxVMCloudinitHelper
   def parse_server_cloudinit(args)
     cloudinit_h = {}
     cloudinit = args['cloudinit']

diff --git a/app/helpers/proxmox_vm_config_helper.rb b/app/helpers/proxmox_vm_config_helper.rb
@@ -24,7 +24,7 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmConfigHelper
+module ProxmoxVMConfigHelper
   def object_to_config_hash(vm, type)
     vm_h = ActiveSupport::HashWithIndifferentAccess.new
     main_a = ['vmid', 'type']

diff --git a/app/helpers/proxmox_vm_helper.rb b/app/helpers/proxmox_vm_helper.rb
@@ -21,11 +21,11 @@
 require 'fog/proxmox/helpers/nic_helper'
 require 'foreman_fog_proxmox/value'
 
-module ProxmoxVmHelper
-  include ProxmoxVmInterfacesHelper
-  include ProxmoxVmVolumesHelper
-  include ProxmoxVmConfigHelper
-  include ProxmoxVmOsTemplateHelper
+module ProxmoxVMHelper
+  include ProxmoxVMInterfacesHelper
+  include ProxmoxVMVolumesHelper
+  include ProxmoxVMConfigHelper
+  include ProxmoxVMOsTemplateHelper
 
   def vm_collection(type)
     collection = :servers

diff --git a/app/helpers/proxmox_vm_interfaces_helper.rb b/app/helpers/proxmox_vm_interfaces_helper.rb
@@ -23,7 +23,7 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmInterfacesHelper
+module ProxmoxVMInterfacesHelper
   def parsed_typed_interfaces(args, type, parsed_vm)
     interfaces_to_add, interfaces_to_delete = parse_typed_interfaces(args, type)
     interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }

diff --git a/app/helpers/proxmox_vm_os_template_helper.rb b/app/helpers/proxmox_vm_os_template_helper.rb
@@ -22,7 +22,7 @@
 require 'foreman_fog_proxmox/value'
 require 'foreman_fog_proxmox/hash_collection'
 
-module ProxmoxVmOsTemplateHelper
+module ProxmoxVMOsTemplateHelper
   def ostemplate_keys
     ['ostemplate_storage', 'ostemplate_file']
   end

diff --git a/app/helpers/proxmox_vm_uuid_helper.rb b/app/helpers/proxmox_vm_uuid_helper.rb
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-module ProxmoxVmUuidHelper
+module ProxmoxVMUuidHelper
   UUID_REGEXP = /(?<cluster_id>\d+)_(?<vmid>\d+)/.freeze
   def extract(uuid, name)
     captures_h = uuid ? UUID_REGEXP.match(uuid.to_s) : { cluster_id: '', vmid: '' }

diff --git a/app/helpers/proxmox_vm_volumes_helper.rb b/app/helpers/proxmox_vm_volumes_helper.rb
@@ -23,9 +23,9 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 # Convert a foreman form server hash into a fog-proxmox server attributes hash
-module ProxmoxVmVolumesHelper
-  include ProxmoxVmCdromHelper
-  include ProxmoxVmCloudinitHelper
+module ProxmoxVMVolumesHelper
+  include ProxmoxVMCdromHelper
+  include ProxmoxVMCloudinitHelper
 
   def add_disk_options(disk, args)
     options = ForemanFogProxmox::HashCollection.new_hash_reject_keys(args,

diff --git a/app/models/concerns/host_ext/proxmox/for_vm.rb b/app/models/concerns/host_ext/proxmox/for_vm.rb
@@ -19,7 +19,7 @@
 
 module HostExt
   module Proxmox
-    module ForVm
+    module ForVM
       extend ActiveSupport::Concern
       module ClassMethods
         def for_vm_uuid(cr, vm)

diff --git a/app/models/foreman_fog_proxmox/proxmox.rb b/app/models/foreman_fog_proxmox/proxmox.rb
@@ -23,11 +23,11 @@
 
 module ForemanFogProxmox
   class Proxmox < ComputeResource
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
     include ProxmoxConnection
-    include ProxmoxVmNew
-    include ProxmoxVmCommands
-    include ProxmoxVmQueries
+    include ProxmoxVMNew
+    include ProxmoxVMCommands
+    include ProxmoxVMQueries
     include ProxmoxComputeAttributes
     include ProxmoxVolumes
     include ProxmoxInterfaces

diff --git a/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb b/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb
@@ -20,10 +20,10 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 module ForemanFogProxmox
-  module ProxmoxVmCommands
+  module ProxmoxVMCommands
     include ProxmoxVolumes
     include ProxmoxPools
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     def start_on_boot(vm, args)
       startonboot = args[:start_after_create].blank? ? false : Foreman::Cast.to_bool(args[:start_after_create])

diff --git a/app/models/foreman_fog_proxmox/proxmox_vm_new.rb b/app/models/foreman_fog_proxmox/proxmox_vm_new.rb
@@ -23,8 +23,8 @@
 require 'foreman_fog_proxmox/hash_collection'
 
 module ForemanFogProxmox
-  module ProxmoxVmNew
-    include ProxmoxVmHelper
+  module ProxmoxVMNew
+    include ProxmoxVMHelper
 
     def cdrom_defaults
       { storage_type: 'cdrom', id: 'ide2', volid: 'none', media: 'cdrom' }

diff --git a/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb b/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb
@@ -18,9 +18,9 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  module ProxmoxVmQueries
+  module ProxmoxVMQueries
     include ProxmoxPools
-    include ProxmoxVmUuidHelper
+    include ProxmoxVMUuidHelper
 
     def nodes
       nodes = client.nodes.all if client

diff --git a/app/models/foreman_fog_proxmox/proxmox_volumes.rb b/app/models/foreman_fog_proxmox/proxmox_volumes.rb
@@ -22,7 +22,7 @@
 
 module ForemanFogProxmox
   module ProxmoxVolumes
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     def delete_volume(vm, id, volume_attributes)
       logger.info("vm #{vm.identity} delete volume #{id}")

diff --git a/db/migrate/20210312105013_update_proxmox_uuid_host.rb b/db/migrate/20210312105013_update_proxmox_uuid_host.rb
@@ -1,4 +1,4 @@
-include ProxmoxVmUuidHelper
+include ProxmoxVMUuidHelper
 class UpdateProxmoxUuidHost < ActiveRecord::Migration[6.0]
   def up
     execute(sql(:concat))

diff --git a/lib/foreman_fog_proxmox/engine.rb b/lib/foreman_fog_proxmox/engine.rb
@@ -23,39 +23,34 @@ module ForemanFogProxmox
   class Engine < ::Rails::Engine
     engine_name 'foreman_fog_proxmox'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/services/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-
     # Add any db migrations
     initializer 'foreman_fog_proxmox.load_app_instance_data' do |app|
       ForemanFogProxmox::Engine.paths['db/migrate'].existent.each do |path|
         app.config.paths['db/migrate'] << path
       end
     end
 
-    initializer 'foreman_fog_proxmox.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_fog_proxmox do
-        requires_foreman '>= 1.22.0'
-        # Add Global files for extending foreman-core components and routes
-        register_global_js_file 'global'
-        # Register Proxmox VE compute resource in foreman
-        compute_resource ForemanFogProxmox::Proxmox
-        parameter_filter(ComputeResource, :uuid)
-        # add dashboard widget
-        widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
-        security_block :foreman_fog_proxmox do
-          permission :view_compute_resources, { :'foreman_fog_proxmox/compute_resources' =>
-            [:ostemplates_by_id_and_node_and_storage,
-             :isos_by_id_and_node_and_storage,
-             :ostemplates_by_id_and_node,
-             :isos_by_id_and_node,
-             :storages_by_id_and_node,
-             :iso_storages_by_id_and_node,
-             :bridges_by_id_and_node] }
+    initializer 'foreman_fog_proxmox.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_fog_proxmox do
+          requires_foreman '>= 1.22.0'
+          # Add Global files for extending foreman-core components and routes
+          register_global_js_file 'global'
+          # Register Proxmox VE compute resource in foreman
+          compute_resource ForemanFogProxmox::Proxmox
+          parameter_filter(ComputeResource, :uuid)
+          # add dashboard widget
+          widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
+          security_block :foreman_fog_proxmox do
+            permission :view_compute_resources, { :'foreman_fog_proxmox/compute_resources' =>
+              [:ostemplates_by_id_and_node_and_storage,
+               :isos_by_id_and_node_and_storage,
+               :ostemplates_by_id_and_node,
+               :isos_by_id_and_node,
+               :storages_by_id_and_node,
+               :iso_storages_by_id_and_node,
+               :bridges_by_id_and_node] }
+          end
         end
       end
     end
@@ -112,7 +107,7 @@ class Engine < ::Rails::Engine
       ::Host::Managed.include Orchestration::Proxmox::Compute
       ::Host::Managed.include HostExt::Proxmox::Interfaces
       ::Host::Managed.include HostExt::Proxmox::Associator
-      ::Host::Base.include HostExt::Proxmox::ForVm
+      ::Host::Base.include HostExt::Proxmox::ForVM
       ::ComputeResourceHostAssociator.include ForemanFogProxmox::ComputeResourceHostAssociator
     end
   end

diff --git a/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb b/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
@@ -21,7 +21,7 @@
 
 module ForemanFogProxmox
   class ProxmoxContainerHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'parse' do
       setup { Fog.mock! }

diff --git a/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb b/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
@@ -21,7 +21,7 @@
 
 module ForemanFogProxmox
   class ProxmoxServerHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'parse' do
       setup { Fog.mock! }

diff --git a/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb b/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
@@ -28,8 +28,8 @@
 require 'fog/proxmox/compute/models/tasks'
 
 module ForemanFogProxmox
-  class ProxmoxVmHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmHelper
+  class ProxmoxVMHelperTest < ActiveSupport::TestCase
+    include ProxmoxVMHelper
 
     let(:container) do
       service = mock('service')

diff --git a/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb b/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
@@ -20,8 +20,8 @@
 require 'test_plugin_helper'
 
 module ForemanFogProxmox
-  class ProxmoxVmUuidHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmUuidHelper
+  class ProxmoxVMUuidHelperTest < ActiveSupport::TestCase
+    include ProxmoxVMUuidHelper
 
     describe 'extract_vmid' do
       setup { Fog.mock! }

diff --git a/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb b/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
@@ -20,8 +20,8 @@
 require 'test_plugin_helper'
 
 module ForemanFogProxmox
-  class ProxmoxVmVolumesHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmVolumesHelper
+  class ProxmoxVMVolumesHelperTest < ActiveSupport::TestCase
+    include ProxmoxVMVolumesHelper
 
     describe 'remove_deletes' do
       setup { Fog.mock! }

diff --git a/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb b/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
@@ -30,7 +30,7 @@ class ProxmoxComputeAttributesTest < ActiveSupport::TestCase
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'host_compute_attrs' do
       before do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_images_test.rb b/test/unit/foreman_fog_proxmox/proxmox_images_test.rb
@@ -21,7 +21,7 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
 
     describe 'clone_from_image' do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb b/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
@@ -30,7 +30,7 @@ class ProxmoxInterfacesTest < ActiveSupport::TestCase
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'host_interfaces_attrs' do
       before do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_test.rb b/test/unit/foreman_fog_proxmox/proxmox_test.rb
@@ -30,7 +30,7 @@ class ProxmoxTest < ActiveSupport::TestCase
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     should validate_presence_of(:url)
     should validate_presence_of(:user)

diff --git a/test/unit/foreman_fog_proxmox/proxmox_version_test.rb b/test/unit/foreman_fog_proxmox/proxmox_version_test.rb
@@ -24,7 +24,7 @@
 module ForemanFogProxmox
   class ProxmoxVersionTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     wrong_version = { version: '5.a', release: '5.a-1' }.with_indifferent_access
     supported_version = { version: '5.4', release: '5.4-3' }.with_indifferent_access

diff --git a/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb b/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
@@ -24,11 +24,11 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsContainerTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsContainerTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb b/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
@@ -24,11 +24,11 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerCreateTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerCreateTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'create_vm' do
       it 'raises Foreman::Exception when vmid <= 100 and vmid > 0' do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb b/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
@@ -24,11 +24,11 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateCdromTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerUpdateCdromTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do

diff --git a/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb b/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
@@ -24,11 +24,11 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateCloudinitTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerUpdateCloudinitTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do