foreman_fog_proxmox 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d5a9b1f9b4ed97380a0fa47196d61bb4ca3b95761eeb81430332166b18cfcd
-  data.tar.gz: ff6784567daf69fc12818289768a1c8e080655dcdd5b25934ef67950701eb7e0
+  metadata.gz: 4521dde2dff786a4f14fcf50c4eb68cd412596029a0f2ee32d54bd8154c51135
+  data.tar.gz: 6e316973c79ab4e51f95578e3c282a0d5345dde397afb5d14ad9ac011a8fc9d0
 SHA512:
-  metadata.gz: d5746802f2ca998ce4d516c35bb472b52e76d5c248307faf035eb7a46c1bf9b6eb31feffc7236509f7c0cf15a7af672601537c51b00fff3aff3babf2d4501231
-  data.tar.gz: 82127d47aa58601018263e066ea5149926cc4a6bdab14f54917175f5762f87d246410ea90050cca5e7021393b73c097a638df17e9a4531f7a75754991e4e7f61
+  metadata.gz: 9d034e8a37538e334329ab3a8df9447325ca7d2809a0b185819bc0fe62757fc39cee691799fa8699802d50855da41d3e4f8df17a3a2ffe1924376dfbcbacfc20
+  data.tar.gz: '09e3bd0ebb1cd6ece7103cc0d07f0d0c5a0c02598a8f72787359599ee8a8004c6c3add7d9d43a7ffdd9b2486c4fe2faeb5fa28b05ddc83cf290fe0ff55211b5a'

data/app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb

@@ -24,7 +24,7 @@ module ForemanFogProxmox
       prepend Overrides
     end
     module Overrides
-      include ForemanFogProxmox::ProxmoxVmNew
+      include ForemanFogProxmox::ProxmoxVMNew
       # Clone the host
       def clone
         super

data/app/helpers/proxmox_vm_attrs_helper.rb

@@ -24,7 +24,7 @@ require 'foreman_fog_proxmox/value'
 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
@@ -114,11 +114,11 @@ module ProxmoxVmAttrsHelper
       start_after_create: vms.start_after_create,
       templated: vms.templated,
     }
-    vms_keys = [:pool, :start_after_create]
+    vms_keys = [:cpu_type, :nameserver, :searchdomain, :hostname]
     extra_attrs = ActiveSupport::HashWithIndifferentAccess.new
     attributes.each do |key, value|
       camel_key = key.to_s.include?('_') ? snake_to_camel(key.to_s).to_sym : key
-      nested_key = vms_keys.include?(key) ? key : "config_attributes[#{key}]"
+      nested_key = vms_keys.include?(key) ? "config_attributes[#{key}]" : key
       value = start_checked if key == :start_after_create
       extra_attrs[camel_key] = { name: "#{param_scope}[#{nested_key}]", value: value }
     end

data/app/helpers/proxmox_vm_cdrom_helper.rb

@@ -23,7 +23,7 @@ require 'foreman_fog_proxmox/value'
 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')

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -23,7 +23,7 @@ require 'foreman_fog_proxmox/value'
 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']

data/app/helpers/proxmox_vm_config_helper.rb

@@ -24,7 +24,7 @@ require 'foreman_fog_proxmox/value'
 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']

data/app/helpers/proxmox_vm_helper.rb

@@ -21,11 +21,11 @@ require 'fog/proxmox/helpers/disk_helper'
 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

data/app/helpers/proxmox_vm_interfaces_helper.rb

@@ -23,7 +23,7 @@ require 'foreman_fog_proxmox/value'
 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) }

data/app/helpers/proxmox_vm_os_template_helper.rb

@@ -22,7 +22,7 @@ require 'fog/proxmox/helpers/nic_helper'
 require 'foreman_fog_proxmox/value'
 require 'foreman_fog_proxmox/hash_collection'
 
-module ProxmoxVmOsTemplateHelper
+module ProxmoxVMOsTemplateHelper
   def ostemplate_keys
     ['ostemplate_storage', 'ostemplate_file']
   end

data/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: '' }

data/app/helpers/proxmox_vm_volumes_helper.rb

@@ -23,9 +23,9 @@ require 'foreman_fog_proxmox/value'
 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,

data/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)

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -23,11 +23,11 @@ require 'foreman_fog_proxmox/value'
 
 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

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -118,7 +118,7 @@ module ForemanFogProxmox
     def set_mac(nic_compute_attributes, mac, type)
       mac_attr_name = { 'qemu' => :macaddr, 'lxc' => :hwaddr }
       mac_key = mac_attr_name[type] || 'mac'
-      nic_compute_attributes[mac_key] = Net::Validations.normalize_mac(mac)
+      nic_compute_attributes[mac_key] = Net::Validations.normalize_mac(mac).upcase
     end
 
     def host_interfaces_attrs(host)

data/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])

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -23,8 +23,8 @@ require 'fog/proxmox/helpers/disk_helper'
 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' }

data/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

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -22,7 +22,7 @@ require 'foreman_fog_proxmox/hash_collection'
 
 module ForemanFogProxmox
   module ProxmoxVolumes
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     def delete_volume(vm, id, volume_attributes)
       logger.info("vm #{vm.identity} delete volume #{id}")
@@ -107,7 +107,7 @@ module ForemanFogProxmox
       return false unless disk
 
       # Return boolean if disk of type hard_disk, cloud_init, cdrom or rootfs(LXC container) exists
-      if disk.hard_disk? || disk.cloud_init? || disk.rootfs?
+      if disk.hard_disk? || disk.cloud_init? || disk.rootfs? || disk.mount_point?
         volume_attributes['volid'].present?
       elsif disk.cdrom?
         volume_attributes['cdrom'].present?

data/app/views/compute_resources_vms/form/proxmox/_add_react_component_to_host_form.html.erb

@@ -1,5 +1,4 @@
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_fog_proxmox %>
-  <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm', "data-turbolinks-track" => true %>
 <% end %>
 <%= react_component('ProxmoxVmType', { registerComp: true }) unless @host.managed %>

data/app/views/templates/provisioning/user_data/proxmox_user_data.erb

@@ -0,0 +1,119 @@
+<%#
+kind: user_data
+name: Proxmox UserData
+model: ProvisioningTemplate
+require:
+ - plugin: foreman_fog_proxmox
+   version: 0.16.1
+oses:
+- AlmaLinux
+- Amazon
+- CentOS
+- CentOS_Stream
+- Debian
+- Rocky
+- Ubuntu
+description: |
+  This template is used during image based provisioning with Proxmox Compute Resource, when
+  the image is configured to use user-data and network config. The output is a list of
+  cloud-init directives that cloud-init parses to configures the VM booted from the image.
+  The image must have cloud-init installed in order for this to work.
+
+  This template accepts the following parameters:
+  - ssh_pwauth: boolean (default=true unless ssh_authorized_keys)
+  - ssh_authorized_keys: string w newline seperated keys (default="")
+  - package_upgrade: boolean (default=false)
+  - reboot: boolean (default=false)
+  - skip-puppet-setup: boolean (default=false)
+-%>
+<%
+  ssh_pwauth = host_param('ssh_pwauth') ? host_param_true?('ssh_pwauth') : !host_param('ssh_authorized_keys')
+  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
+  # safemode renderer does not support unary negation
+  puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
+  salt_enabled = host_param('salt_master') ? true : false
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
+-%>
+<%
+username_to_create = host_param('username_to_create', 'root')
+password_to_create = host_param('password_to_create') || @host.root_pass
+-%>
+#cloud-config
+hostname: <%= @host.shortname %>
+fqdn: <%= @host %>
+manage_etc_hosts: true
+<% if ssh_pwauth -%>
+<%# Don't enable this in production. It is very insecure! Use ssh_authorized_keys instead...
+    http://cloudinit.readthedocs.io/en/latest/topics/examples.html#including-users-and-groups -%>
+ssh_pwauth: true
+users:
+  - name: <%= username_to_create %>
+    shell: /bin/bash
+    sudo: ALL=(ALL) ALL
+    lock_passwd: false
+    hashed_passwd: <%= password_to_create %>
+<% end -%>
+<% if host_param('ssh_authorized_keys') -%>
+ssh_authorized_keys:
+<% host_param('ssh_authorized_keys').split("\n").each do |ssh_key| -%>
+- <%= ssh_key %>
+<% end -%>
+<% end -%>
+
+<% if host_param_true?('package_upgrade') -%>
+package_upgrade: true
+<% end -%>
+
+runcmd:
+<% if rhel_compatible -%>
+- |
+<%= indent(2) { snippet('epel') } %>
+<% end -%>
+- |
+<%= indent(2) { snippet('remote_execution_ssh_keys') } %>
+<% if chef_enabled -%>
+- |
+<%= indent(2) { snippet('chef_client') } %>
+<% end -%>
+<% if puppet_enabled -%>
+- |
+<%= indent(2) { snippet('puppetlabs_repo') } %>
+- |
+<%= indent(2) { snippet('puppet_setup') } %>
+<% end -%>
+<% if salt_enabled -%>
+- |
+<%= indent(2) { snippet('saltstack_setup') } %>
+<% end -%>
+
+<%# Contact Foreman to confirm instance is built -%>
+phone_home:
+  url: <%= foreman_url('built') %>
+  post: []
+  tries: 10
+
+<% if host_param_true?('reboot') -%>
+power_state:
+  mode: reboot
+  timeout: 30
+  condition: true
+<% end -%>
+
+#network-config
+version: 2
+ethernets:
+  eth0:
+    match:
+      name: e*
+    dhcp4: false
+    dhcp6: false
+    addresses:
+      - <%= @host.ip %>/<%= @host.subnet.cidr %>
+    routes:
+      - to: 0.0.0.0
+        via: <%= @host.subnet.gateway %>
+    nameservers:
+      addresses:
+        - <%= @host.subnet.dns_primary%>
+      search:
+        - <%= @host.domain.name %>

data/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))

data/db/seeds.d/71_provisioning_templates.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+ProvisioningTemplate.without_auditing do
+  SeedHelper.import_templates(
+    Dir[File.join("#{ForemanFogProxmox::Engine.root}/app/views/templates/provisioning/**/*.erb")]
+  )
+end

data/lib/foreman_fog_proxmox/engine.rb

@@ -23,13 +23,6 @@ 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|
@@ -37,25 +30,27 @@ module ForemanFogProxmox
       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 @@ module ForemanFogProxmox
       ::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

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb

@@ -21,7 +21,7 @@ require 'test_plugin_helper'
 
 module ForemanFogProxmox
   class ProxmoxContainerHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'parse' do
       setup { Fog.mock! }

data/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb

@@ -21,7 +21,7 @@ require 'test_plugin_helper'
 
 module ForemanFogProxmox
   class ProxmoxServerHelperTest < ActiveSupport::TestCase
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'parse' do
       setup { Fog.mock! }

data/test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb

@@ -28,8 +28,8 @@ require 'fog/proxmox/compute/models/snapshots'
 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')

data/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! }

data/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! }

data/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb

@@ -30,7 +30,7 @@ module ForemanFogProxmox
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'host_compute_attrs' do
       before do

data/test/unit/foreman_fog_proxmox/proxmox_images_test.rb

@@ -21,7 +21,7 @@ require 'test_plugin_helper'
 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

data/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb

@@ -30,7 +30,7 @@ module ForemanFogProxmox
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'host_interfaces_attrs' do
       before do
@@ -54,7 +54,7 @@ module ForemanFogProxmox
 
       it 'sets interface identifier with server compute id, ip and ip6 and mac adress' do
         ip = '192.168.56.100'
-        mac_address = '36:25:8c:53:0c:50'
+        mac_address = '36:25:8C:53:0C:50'
         ip6 = Array.new(4) { format('%<x>s', x: rand(16**4)) }.join(':') + '::1'
         compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0' })
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6,
@@ -131,7 +131,7 @@ module ForemanFogProxmox
 
       it 'sets container compute ip DHCP, mac adress and firewall' do
         ip = '192.168.56.100'
-        mac_address = '36:25:8c:53:0c:50'
+        mac_address = '36:25:8C:53:0C:50'
         ip6 = '2001:0:1234::c1c0:abcd:876'
         firewall = '1'
         compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0', 'dhcp' => '1',

data/test/unit/foreman_fog_proxmox/proxmox_test.rb

@@ -30,7 +30,7 @@ module ForemanFogProxmox
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     should validate_presence_of(:url)
     should validate_presence_of(:user)

data/test/unit/foreman_fog_proxmox/proxmox_version_test.rb

@@ -24,7 +24,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 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

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_container_mock_factory'
 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

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 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