foreman_fog_proxmox 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15adca3cf1f65b7b543dcb24972d640c7cbd78ca11c6c7e657a1d1d0da2e250c
-  data.tar.gz: 387a162262465681620bf37c69ecac793757b09b7b592cd1209ce97741748a17
+  metadata.gz: e42832dc77d338bb20585f27678bc2207c23a610f7c7b478f24f3791ca65a414
+  data.tar.gz: 1385bea7eed802496ae7ab85ca013e75dc0343a8a433a347d8811b59fd620cd0
 SHA512:
-  metadata.gz: 1222697f1f9a8eba96c0f45156420e1437139b2e8927c31944bc8e78ce915ba37f52e595d3e25edc3ab56ebc96db09f27866677f256674681814909dd57cf9fa
-  data.tar.gz: 0d1f4df3e6be994ef693df0d89755123fd440ed9d0eb2bdd660b10a8c55d0cf12bddd425bd0078fc9b1d5a2f14647a90ae7c8b01f9c0e3f6cd866d4f564933fc
+  metadata.gz: 91a262ffeb2b720fae01136cdcd158cd8c577702fafbea36d550eae859c6734f7a7ec1c390b39077852100d4507d9b3502bb7f3f1cb5c7d22c02cd7b012c51cf
+  data.tar.gz: 25512a916934966d9b5e66494f1b294c5b13d69ba326ed61170e330bff616111103984701a6311b150fb444dab3f0a48920c8debe193b7698a2ec43a0110cdd1

data/README.md

@@ -34,6 +34,7 @@ You can support the plugin development via the following methods:
 |>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
 |>=0.14 |>=6.2|=0.13.0|>=2.4|>=2.7|
 |>=0.14 |>=6.2|>=0.13.1|>=2.3|>=2.5|
+|>=0.14 |>=6.2|>=0.14.0|>=2.5|>=2.5|
 
 ## Installation
 
@@ -47,10 +48,10 @@ See complete details in [plugin installation from gem](https://theforeman.org/pl
 
 Here is a Debian sample:
 
-* Install foreman [from OS packages](https://theforeman.org/manuals/1.19/index.html#3.3InstallFromPackages):
+* Install foreman [from OS packages](https://theforeman.org/manuals/latest/index.html#3.3InstallFromPackages):
 
 ```shell
-sudo apt install -y foreman foreman-compute foreman-sqlite3 foreman-assets
+sudo apt install -y foreman foreman-pgsql
 ```
 
 * Use only foreman user (**not root!**) `sudo -u foreman ...`
@@ -102,7 +103,21 @@ Then you can check plugin installation after login into your new foreman server
 
 Please see the Foreman manual for complete instructions:
 
-* [Foreman: How to Install a Plugin](http://theforeman.org/manuals/latest/index.html#6.1InstallaPlugin)
+* [Foreman: How to Install a Plugin from package](https://theforeman.org/plugins/#2.Installation)
+
+[Install from package](https://theforeman.org/plugins/#2.2Packageinstallation) is the easiest way to install the plugin. Choose the latest release plugins repository. If you don't find it in the same foreman release repository, get it from the `nightly` repository.
+
+Then you can install it with the package manager, in Debian/Ubuntu:
+
+```shell
+sudo apt-get install ruby-foreman-fog-proxmox
+```
+
+and in Fedora/Redhat Linux:
+
+```shell
+sudo dnf install rubygem-foreman_fog_proxmox
+```
 
 Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.theforeman.org/projects/foreman/wiki/SELinux) to allow foreman and all its plugins to work.
 
@@ -113,7 +128,7 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 
 ## Development
 
-### Prerequisites
+### Dev prerequisites
 
 * You need a Proxmox VE 5.4+ server running.
 * You need ruby >= 2.5. You can install it with [asdf-vm](https://asdf-vm.com).
@@ -189,7 +204,7 @@ add these lines to each environment in config/database.yml:
 
 ```shell
 cp config/ignored_environments.yml.sample config/ignored_environments.yml
-docker run --name foreman-db -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres
+docker run --name foreman-db -v foreman_data:/var/lib/postgresql/data -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres
 bundle exec bin/rake db:migrate
 # reboot if settings.NAME error in schema
 bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ForemanFogProxmox
+  module ComputeResourcesVmsController
+    extend ActiveSupport::Concern
+    included do
+      prepend Overrides
+    end
+    module Overrides
+      def associate
+        if Host.for_vm_uuid(@compute_resource, @vm).any?
+          process_error(:error_msg => _("VM already associated with a host"), :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+          return
+        end
+        host = @compute_resource.associated_host(@vm) if @compute_resource.respond_to?(:associated_host)
+        if host.present?
+          host.associate!(@compute_resource, @vm)
+          process_success(:success_msg => _("VM associated to host %s") % host.name, :success_redirect => host_path(host))
+        else
+          process_error(:error_msg => _("No host found to associate this VM with"), :redirect => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+        end
+      end
+
+      def console
+        @console = @compute_resource.console proxmox_vm_id(@compute_resource, @vm)
+        render case @console[:type]
+               when 'spice'
+                 'hosts/console/spice'
+               when 'vnc'
+                 'hosts/console/vnc'
+               when 'vmrc'
+                 'hosts/console/vmrc'
+               else
+                 'hosts/console/log'
+               end
+      rescue StandardError => e
+        process_error :redirect => compute_resource_vm_path(@compute_resource, proxmox_vm_id(@compute_resource, @vm)), :error_msg => (_("Failed to set console: %s") % e), :object => @vm
+      end
+
+      private
+
+      def proxmox_vm_id(compute_resource, vm)
+        id = vm.identity
+        id = vm.unique_cluster_identity(compute_resource) if compute_resource.class == ForemanFogProxmox::Proxmox
+        id
+      end
+
+      def run_vm_action(action)
+        if @vm.send(action)
+          @vm.reload
+          success format(_("%<vm>s is now %<vm_state>s"), { :vm => @vm, :vm_state => @vm.state.capitalize })
+        else
+          error format(_("failed to %<action>s %<vm>s"), { :action => _(action), :vm => @vm })
+        end
+        redirect_back(:fallback_location => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+      # This should only rescue Fog::Errors, but Fog returns all kinds of errors...
+      rescue StandardError => e
+        error format(_("Error - %<message>s"), { :message => _(e.message) })
+        redirect_back(:fallback_location => compute_resource_vm_path(:compute_resource_id => params[:compute_resource_id], :id => proxmox_vm_id(@compute_resource, @vm)))
+      end
+    end
+  end
+end

data/app/helpers/proxmox_compute_resources_vms_helper.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ProxmoxComputeResourcesVmsHelper
+  def proxmox_vm_id(compute_resource, vm)
+    id = vm.identity
+    id = vm.unique_cluster_identity(compute_resource) if compute_resource.class == ForemanFogProxmox::Proxmox
+    id
+  end
+
+  def vm_host_action(vm)
+    host = Host.for_vm_uuid(@compute_resource, vm).first
+    return unless host
+
+    display_link_if_authorized(_("Host"), hash_for_host_path(:id => host), :class => 'btn btn-default')
+  end
+
+  def vm_power_action(vm, authorizer = nil)
+    opts = hash_for_power_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(:auth_object => @compute_resource, :permission => 'power_compute_resources_vms', :authorizer => authorizer)
+    html = power_action_html(vm)
+
+    display_link_if_authorized "Power #{action_string(vm)}", opts, html.merge(:method => :put)
+  end
+
+  def vm_associate_action(vm)
+    display_link_if_authorized(
+      _('Associate VM'),
+      hash_for_associate_compute_resource_vm_path(
+        :compute_resource_id => @compute_resource,
+        :id => proxmox_vm_id(@compute_resource, vm)
+      ).merge(
+        :auth_object => @compute_resource,
+        :permission => 'edit_compute_resources'),
+      :title => _('Associate VM to a Foreman host'),
+      :method => :put,
+      :class => 'btn btn-default'
+    )
+  end
+
+  def vm_import_action(vm, html_options = {})
+    @_linked_hosts_cache ||= Host.where(:compute_resource_id => @compute_resource.id).pluck(:uuid)
+    return if @_linked_hosts_cache.include?(proxmox_vm_id(@compute_resource, vm).to_s)
+
+    import_managed_link = display_link_if_authorized(
+      _('Import as managed Host'),
+      hash_for_import_compute_resource_vm_path(
+        :compute_resource_id => @compute_resource,
+        :id => proxmox_vm_id(@compute_resource, vm),
+        :type => 'managed'),
+      html_options
+    )
+    import_unmanaged_link = display_link_if_authorized(
+      _('Import as unmanaged Host'),
+      hash_for_import_compute_resource_vm_path(
+        :compute_resource_id => @compute_resource,
+        :id => proxmox_vm_id(@compute_resource, vm),
+        :type => 'unmanaged'),
+      html_options
+    )
+
+    import_managed_link + import_unmanaged_link
+  end
+
+  def vm_console_action(vm)
+    return unless vm.ready?
+
+    link_to_if_authorized(
+      _('Console'),
+      hash_for_console_compute_resource_vm_path.merge(
+        :auth_object => @compute_resource,
+        :id => proxmox_vm_id(@compute_resource, vm)
+      ),
+      {
+        :id => 'console-button',
+        :class => 'btn btn-info'
+      }
+    )
+  end
+
+  def vm_delete_action(vm, authorizer = nil)
+    display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => proxmox_vm_id(@compute_resource, vm)).merge(:auth_object => @compute_resource, :authorizer => authorizer), :class => 'btn btn-danger')
+  end
+end

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -23,8 +23,8 @@ module FogExtensions
       extend ActiveSupport::Concern
       attr_accessor :image_id, :templated, :ostemplate_storage, :ostemplate_file, :password, :start_after_create
 
-      def unique_cluster_identity
-        compute_resource.name + '_' + identity
+      def unique_cluster_identity(compute_resource)
+        compute_resource.id.to_s + '_' + identity
       end
 
       def start

data/app/models/concerns/host_ext/proxmox/associator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module HostExt
+  module Proxmox
+    module Associator
+      extend ActiveSupport::Concern
+      included do
+        prepend Overrides
+      end
+      module Overrides
+        def associate!(cr, vm)
+          self.uuid = proxmox_vm_id(cr, vm)
+          self.compute_resource_id = cr.id
+          save!(:validate => false) # don't want to trigger callbacks
+        end
+
+        def proxmox_vm_id(compute_resource, vm)
+          id = vm.identity
+          id = vm.unique_cluster_identity(compute_resource) if compute_resource.class == ForemanFogProxmox::Proxmox
+          id
+        end
+      end
+
+      def for_vm_uuid(cr, vm)
+        where(:compute_resource_id => cr.id, :uuid => Array.wrap(vm).compact.map(cr.id.to_s + '_' + vm&.identity).map(&:to_s))
+      end
+    end
+  end
+end

data/app/models/concerns/host_ext/proxmox/for_vm.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module HostExt
+  module Proxmox
+    module ForVm
+      extend ActiveSupport::Concern
+      module ClassMethods
+        def for_vm_uuid(cr, vm)
+          uuid = vm&.identity
+          uuid = cr.id.to_s + '_' + vm&.identity if cr.class == ForemanFogProxmox::Proxmox
+          where(:compute_resource_id => cr.id, :uuid => uuid)
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/orchestration/proxmox/compute.rb

@@ -23,18 +23,26 @@ module Orchestration
       extend ActiveSupport::Concern
 
       def setComputeUpdate
-        logger.info "Update Proxmox Compute instance for #{name}"
-        final_compute_attributes = compute_attributes.merge(compute_resource.host_compute_attrs(self))
-        logger.debug("setComputeUpdate: final_compute_attributes=#{final_compute_attributes}")
-        compute_resource.save_vm uuid, final_compute_attributes
+        if compute_resource.class != ForemanFogProxmox::Proxmox
+          super
+        else
+          logger.info "Update Proxmox Compute instance for #{name}"
+          final_compute_attributes = compute_attributes.merge(compute_resource.host_compute_attrs(self))
+          logger.debug("setComputeUpdate: final_compute_attributes=#{final_compute_attributes}")
+          compute_resource.save_vm uuid, final_compute_attributes
+        end
       rescue StandardError => e
         failure format(_('Failed to update a compute %<compute_resource>s instance %<name>s: %<e>s'), :compute_resource => compute_resource, :name => name, :e => e), e
       end
 
       def delComputeUpdate
-        logger.info "Undo Update Proxmox Compute instance for #{name}"
-        final_compute_attributes = old.compute_attributes.merge(compute_resource.host_compute_attrs(old))
-        compute_resource.save_vm uuid, final_compute_attributes
+        if compute_resource.class != ForemanFogProxmox::Proxmox
+          super
+        else
+          logger.info "Undo Update Proxmox Compute instance for #{name}"
+          final_compute_attributes = old.compute_attributes.merge(compute_resource.host_compute_attrs(old))
+          compute_resource.save_vm uuid, final_compute_attributes
+        end
       rescue StandardError => e
         failure format(_('Failed to undo update compute %<compute_resource>s instance %<name>s: %<e>s'), :compute_resource => compute_resource, :name => name, :e => e), e
       end
@@ -80,7 +88,9 @@ module Orchestration
       end
 
       def setComputeDetails
-        if vm
+        if compute_resource.class != ForemanFogProxmox::Proxmox
+          super
+        elsif vm
           setVmDetails
         else
           failure format(_('failed to save %<name>s'), name: name)

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -64,6 +64,10 @@ module ForemanFogProxmox
       associate_by('mac', vm.mac)
     end
 
+    def associate_by(name, attributes)
+      Host.authorized(:view_hosts, Host).joins(:primary_interface).where(:nics => { :primary => true }).where("nics.#{name}" => attributes).readonly(false).first
+    end
+
     def ssl_certs
       attrs[:ssl_certs]
     end

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -27,9 +27,7 @@ module ForemanFogProxmox
         host.compute_attributes['config_attributes'].store('hostname', host.name)
       when 'qemu'
         host.compute_attributes['config_attributes'].store('name', host.name)
-        unless compute_os_types(host).include?(ostype)
-          raise ::Foreman::Exception, format(_('Operating system family %<type>s is not consistent with %<ostype>s'), type: host.operatingsystem.type, ostype: ostype)
-        end
+        raise ::Foreman::Exception, format(_('Operating system family %<type>s is not consistent with %<ostype>s'), type: host.operatingsystem.type, ostype: ostype) unless compute_os_types(host).include?(ostype)
       end
       super
     end
@@ -50,9 +48,7 @@ module ForemanFogProxmox
       vm_attrs = vm_attrs.merge(vmid: vm.identity, node_id: vm.node_id, type: vm.type)
       if vm.respond_to?(:config)
         vm_attrs[:volumes_attributes] = Hash[vm.config.disks.each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }] if vm.config.respond_to?(:disks)
-        if vm.config.respond_to?(:interfaces)
-          vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }]
-        end
+        vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }] if vm.config.respond_to?(:interfaces)
         vm_attrs[:config_attributes] = vm.config.attributes.reject do |key, value|
           not_config_key?(vm, key) || ForemanFogProxmox::Value.empty?(value.to_s) || Fog::Proxmox::DiskHelper.disk?(key.to_s) || Fog::Proxmox::NicHelper.nic?(key.to_s)
         end

data/app/models/foreman_fog_proxmox/proxmox_images.rb

@@ -31,8 +31,17 @@ module ForemanFogProxmox
       storage.volumes.list_by_content_type(type).sort_by(&:volid) if storage
     end
 
+    def template_name(template)
+      image = find_vm_by_uuid(template_uuid(template))
+      image&.name
+    end
+
+    def template_uuid(template)
+      id.to_s + '_' + template.vmid.to_s
+    end
+
     def available_images
-      templates.collect { |template| OpenStruct.new(id: template.vmid.to_s) }
+      templates.collect { |template| OpenStruct.new(id: template_uuid(template), name: template_name(template)) }
     end
 
     def templates
@@ -44,15 +53,15 @@ module ForemanFogProxmox
       volumes.select(&:template?)
     end
 
-    def template(vmid)
-      find_vm_by_uuid(vmid)
+    def template(uuid)
+      find_vm_by_uuid(uuid)
     end
 
     def clone_from_image(image_id, args, vmid)
       logger.debug(format(_('create_vm(): clone %<image_id>s in %<vmid>s'), image_id: image_id, vmid: vmid))
       image = find_vm_by_uuid(image_id)
       image.clone(vmid)
-      clone = find_vm_by_uuid(vmid)
+      clone = find_vm_by_uuid(id.to_s + '_' + vmid.to_s)
       options = {}
       options.store(:name, args[:name]) unless clone.container?
       options.store(:hostname, args[:name]) if clone.container?

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -18,6 +18,7 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 require 'fog/proxmox/helpers/ip_helper'
+require 'net/validations'
 
 module ForemanFogProxmox
   module ProxmoxInterfaces
@@ -104,7 +105,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] = mac
+      nic_compute_attributes[mac_key] = Net::Validations.normalize_mac(mac)
     end
 
     def host_interfaces_attrs(host)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -56,8 +56,10 @@ module ForemanFogProxmox
 
     def destroy_vm(uuid)
       vm = find_vm_by_uuid(uuid)
-      vm.stop if vm.ready?
-      vm.destroy
+      unless vm.nil?
+        vm.stop if vm.ready?
+        vm.destroy
+      end
     rescue ActiveRecord::RecordNotFound
       # if the VM does not exists, we don't really care.
       true

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -166,9 +166,7 @@ module ForemanFogProxmox
     def convert_config_attributes(new_attr)
       config_attributes = new_attr[:config_attributes]
       config_attributes[:volumes_attributes] = Hash[config_attributes[:disks].each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }] if config_attributes.key?(:disks)
-      if config_attributes.key?(:interfaces)
-        config_attributes[:interfaces_attributes] = Hash[config_attributes[:interfaces].each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }]
-      end
+      config_attributes[:interfaces_attributes] = Hash[config_attributes[:interfaces].each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }] if config_attributes.key?(:interfaces)
       config_attributes.delete_if { |key, _value| ['disks', 'interfaces'].include?(key) }
     end
 
@@ -181,7 +179,7 @@ module ForemanFogProxmox
       new_attr_type ||= type
       logger.debug(format(_('new_typed_vm(%<type>s): new_attr_type=%<new_attr_type>s'), type: type, new_attr_type: new_attr_type))
       logger.debug(format(_('new_typed_vm(%<type>s): new_attr=%<new_attr>s'), type: type, new_attr: new_attr))
-      options = !new_attr.key?('vmid') || ForemanFogProxmox::Value.empty?(new_attr['vmid']) ? new_attr.merge(vm_typed_instance_defaults(type)).merge(type: type) : new_attr
+      options = !new_attr.key?('vmid') || ForemanFogProxmox::Value.empty?(new_attr['vmid']) ? vm_typed_instance_defaults(type).merge(new_attr).merge(type: type) : new_attr
       logger.debug(format(_('new_typed_vm(%<type>s): options=%<options>s'), type: type, options: options))
       vm_h = parse_typed_vm(options, type).deep_symbolize_keys
       logger.debug(format(_('new_typed_vm(%<type>s): vm_h=%<vm_h>s'), type: type, vm_h: vm_h))

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -43,9 +43,14 @@ module ForemanFogProxmox
     end
 
     # TODO: Pagination with filters
-    def vms(_opts = {})
+    def vms(opts = {})
       vms = []
       nodes.each { |node| vms += node.servers.all + node.containers.all }
+      if opts.key?(:eager_loading) && opts[:eager_loading]
+        vms_eager = []
+        vms.each { |vm| vms_eager << vm.collection.get(vm.identity) }
+        vms = vms_eager
+      end
       ForemanFogProxmox::Vms.new(vms)
     end
 

data/app/models/foreman_fog_proxmox/vms.rb

@@ -22,7 +22,7 @@ module ForemanFogProxmox
     attr_reader :items
 
     def each
-      @items.each
+      @items.each { |item| yield item }
     end
 
     # TODO: Pagination with filters

data/app/services/concerns/foreman_fog_proxmox/compute_resource_host_associator.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ForemanFogProxmox
+  module ComputeResourceHostAssociator
+    extend ActiveSupport::Concern
+    included do
+      prepend Overrides
+    end
+    module Overrides
+      def associate_hosts
+        compute_resource.vms(:eager_loading => true).each do |vm|
+          associate_vm(vm) if Host.for_vm_uuid(compute_resource, vm).empty?
+        end
+      end
+    end
+  end
+end

data/app/views/compute_resources_vms/index/_proxmox.html.erb

@@ -31,7 +31,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <tbody>
   <% @vms.each do |vm| -%>
       <tr>
-        <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+        <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.unique_cluster_identity(@compute_resource)) %></td>
         <td><%= vm.node_id %></td>
         <td><%= vm.type %></td>
         <td><%= vm.cpus %></td>
@@ -41,7 +41,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
         <td>
         <%= action_buttons(
                 vm_power_action(vm, authorizer),
-                display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer))) %>
+                display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.unique_cluster_identity(@compute_resource)).merge(:auth_object => @compute_resource, :authorizer => authorizer))) %>
         </td>
       </tr>
   <% end -%>

data/lib/foreman_fog_proxmox/engine.rb

@@ -26,6 +26,7 @@ module ForemanFogProxmox
     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"]
 
@@ -101,10 +102,14 @@ module ForemanFogProxmox
       Fog::Proxmox::Compute::ServerConfig.include FogExtensions::Proxmox::ServerConfig
       Fog::Proxmox::Compute::Interface.include FogExtensions::Proxmox::Interface
       Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
-      ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
       Fog::Proxmox::Compute::Node.include FogExtensions::Proxmox::Node
+      ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
+      ::ComputeResourcesVmsController.include ForemanFogProxmox::ComputeResourcesVmsController
       ::Host::Managed.include Orchestration::Proxmox::Compute
       ::Host::Managed.include HostExt::Proxmox::Interfaces
+      ::Host::Managed.include HostExt::Proxmox::Associator
+      ::Host::Base.include HostExt::Proxmox::ForVm
+      ::ComputeResourceHostAssociator.include ForemanFogProxmox::ComputeResourceHostAssociator
     end
   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.13.3'
+  VERSION = '0.13.4'
 end

data/test/unit/foreman_fog_proxmox/proxmox_images_test.rb

@@ -28,7 +28,7 @@ module ForemanFogProxmox
       before do
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
         @args = { :name => 'name' }
-        @image_id = 100
+        @image_id = @cr.id.to_s + '_' + 100.to_s
         @vmid = 101
         @image = mock('vm')
         @image.expects(:clone)
@@ -38,13 +38,13 @@ module ForemanFogProxmox
       it 'clones server from image' do
         @clone.expects(:update).with(:name => 'name')
         @clone.stubs(:container?).returns(false)
-        @cr.stubs(:find_vm_by_uuid).with(@vmid).returns(@clone)
+        @cr.stubs(:find_vm_by_uuid).with(@cr.id.to_s + '_' + @vmid.to_s).returns(@clone)
         @cr.clone_from_image(@image_id, @args, @vmid)
       end
       it 'clones container from image' do
         @clone.stubs(:container?).returns(true)
         @clone.expects(:update).with(:hostname => 'name')
-        @cr.stubs(:find_vm_by_uuid).with(@vmid).returns(@clone)
+        @cr.stubs(:find_vm_by_uuid).with(@cr.id.to_s + '_' + @vmid.to_s).returns(@clone)
         @cr.clone_from_image(@image_id, @args, @vmid)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb

@@ -48,7 +48,7 @@ module ForemanFogProxmox
 
       it 'sets server compute id with identifier, 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'
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6, :mac => mac_address)
         host = FactoryBot.build(
@@ -117,7 +117,7 @@ module ForemanFogProxmox
 
       it 'sets container compute id with identifier, 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 = { 'dhcp' => '1', 'ip6' => ip6, 'firewall' => firewall }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -100,11 +100,13 @@ files:
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cdrom.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js
+- app/controllers/concerns/foreman_fog_proxmox/compute_resources_vms_controller.rb
 - app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb
 - app/controllers/foreman_fog_proxmox/compute_resources_controller.rb
 - app/helpers/node_dashboard_helper.rb
 - app/helpers/proxmox_compute_controllers_helper.rb
 - app/helpers/proxmox_compute_resources_helper.rb
+- app/helpers/proxmox_compute_resources_vms_helper.rb
 - app/helpers/proxmox_compute_selectors_helper.rb
 - app/helpers/proxmox_form_helper.rb
 - app/helpers/proxmox_storages_helper.rb
@@ -121,6 +123,8 @@ files:
 - app/models/concerns/fog_extensions/proxmox/node.rb
 - app/models/concerns/fog_extensions/proxmox/server.rb
 - app/models/concerns/fog_extensions/proxmox/server_config.rb
+- app/models/concerns/host_ext/proxmox/associator.rb
+- app/models/concerns/host_ext/proxmox/for_vm.rb
 - app/models/concerns/host_ext/proxmox/interfaces.rb
 - app/models/concerns/orchestration/proxmox/compute.rb
 - app/models/foreman_fog_proxmox/options_select.rb
@@ -146,6 +150,7 @@ files:
 - app/overrides/compute_resources_vms/form/add_vm_type_to_volumes_edit.rb
 - app/overrides/compute_resources_vms/form/add_vm_type_to_volumes_new_volume.rb
 - app/overrides/compute_resources_vms/form/remove_new_vm_from_removable_layout.rb
+- app/services/concerns/foreman_fog_proxmox/compute_resource_host_associator.rb
 - app/services/foreman_fog_proxmox/node_dashboard/data.rb
 - app/views/api/v2/compute_resources/proxmox.json.rabl
 - app/views/compute_resources/form/_proxmox.html.erb
@@ -237,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox