foreman_fog_proxmox 0.13.0 → 0.13.4

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -26,9 +26,8 @@ module ForemanFogProxmox
       when 'lxc'
         host.compute_attributes['config_attributes'].store('hostname', host.name)
       when 'qemu'
-        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
+        host.compute_attributes['config_attributes'].store('name', host.name)
+        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
@@ -49,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

@@ -50,14 +50,16 @@ module ForemanFogProxmox
       end
     rescue StandardError => e
       logger.warn(format(_('failed to create vm: %<e>s'), e: e))
-      destroy_vm vm.id if vm
+      destroy_vm client.identity + '_' + vm.id if vm
       raise e
     end
 
     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

@@ -20,6 +20,7 @@
 module ForemanFogProxmox
   module ProxmoxVmQueries
     include ProxmoxPools
+    include ProxmoxVmUuidHelper
 
     def nodes
       nodes = client.nodes.all if client
@@ -42,34 +43,40 @@ 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
 
     def find_vm_by_uuid(uuid)
       # look for the uuid on all known nodes
       vm = nil
+      vmid = extract_vmid(uuid)
       nodes.each do |node|
-        vm = find_vm_in_servers_by_uuid(node.servers, uuid)
-        vm ||= find_vm_in_servers_by_uuid(node.containers, uuid)
+        vm = find_vm_in_servers_by_vmid(node.servers, vmid)
+        vm ||= find_vm_in_servers_by_vmid(node.containers, vmid)
         unless vm.nil?
-          logger.debug("found vm #{uuid} on node #{node.node}")
+          logger.debug("found vm #{vmid} on node #{node.node}")
           break
         end
       end
       vm
     end
 
-    def find_vm_in_servers_by_uuid(servers, uuid)
-      vm = servers.get(uuid) unless ForemanFogProxmox::Value.empty?(uuid)
+    def find_vm_in_servers_by_vmid(servers, vmid)
+      vm = servers.get(vmid) unless ForemanFogProxmox::Value.empty?(vmid)
       pool_owner(vm) if vm
       vm
     rescue Fog::Errors::NotFound
       nil
     rescue StandardError => e
-      Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: uuid), e)
+      Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: vmid), e)
       raise(ActiveRecord::RecordNotFound, e)
     end
   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/services/foreman_fog_proxmox/node_dashboard/data.rb

@@ -24,9 +24,13 @@ module ForemanFogProxmox
         @filter = filter
       end
 
+      def node
+        @compute_resource = ComputeResource.where(type: 'ForemanFogProxmox::Proxmox').first
+        @compute_resource.nodes.first
+      end
+
       def node_id
-        @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
-        @compute_resource&.node_id
+        node&.identity
       end
 
       def statistics

data/app/views/api/v2/compute_resources/proxmox.json.rabl

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-attributes :url, :user, :password, :ssl_verify_peer, :ssl_certs, :renew
+attributes :url, :user, :ssl_verify_peer, :ssl_certs, :renew

data/app/views/compute_resources_vms/form/proxmox/server/_volume_cdrom.html.erb

@@ -27,7 +27,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= radio_button_f f, :cdrom, :value => 'cdrom' , :text => _('Physical'), :onclick => 'cdromSelected(this)' %>
     <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
   <% end %>
-  <%= field_set_tag _("Image"), :id => "cdrom_image_form_#{f.index}", :class => ('hide' unless %[image].include? f.object.cdrom), :disabled => (%[cdrom none].include? f.object.cdrom)  do %>
+  <%= field_set_tag(_("Image"), :id => "cdrom_image_form_#{f.index}", :class => ('hide' unless %[image].include? f.object.cdrom), :disabled => (%[cdrom none].include? f.object.cdrom)) do %>
     <%= select_f f, :storage, compute_resource.storages(node_id,'iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
     <%= select_f f, :volid, compute_resource.images_by_storage(node_id, f.object.storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
   <% 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/config/routes.rb

@@ -19,12 +19,12 @@
 
 Rails.application.routes.draw do
   namespace :foreman_fog_proxmox do
-    match 'isos/:node_id/:storage', :to => 'compute_resources#isos_by_node_and_storage', :via => 'get'
-    match 'ostemplates/:node_id/:storage', :to => 'compute_resources#ostemplates_by_node_and_storage', :via => 'get'
-    match 'isos/:node_id', :to => 'compute_resources#isos_by_node', :via => 'get'
-    match 'ostemplates/:node_id', :to => 'compute_resources#ostemplates_by_node', :via => 'get'
-    match 'storages/:node_id', :to => 'compute_resources#storages_by_node', :via => 'get'
-    match 'isostorages/:node_id', :to => 'compute_resources#iso_storages_by_node', :via => 'get'
-    match 'bridges/:node_id', :to => 'compute_resources#bridges_by_node', :via => 'get'
+    match 'isos/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#isos_by_id_and_node_and_storage', :via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#ostemplates_by_id_and_node_and_storage', :via => 'get'
+    match 'isos/:compute_resource_id/:node_id', :to => 'compute_resources#isos_by_id_and_node', :via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id', :to => 'compute_resources#ostemplates_by_id_and_node', :via => 'get'
+    match 'storages/:compute_resource_id/:node_id', :to => 'compute_resources#storages_by_id_and_node', :via => 'get'
+    match 'isostorages/:compute_resource_id/:node_id', :to => 'compute_resources#iso_storages_by_id_and_node', :via => 'get'
+    match 'bridges/:compute_resource_id/:node_id', :to => 'compute_resources#bridges_by_id_and_node', :via => 'get'
   end
 end

data/db/migrate/20210312105013_update_proxmox_uuid_host.rb

@@ -0,0 +1,29 @@
+include ProxmoxVmUuidHelper
+class UpdateProxmoxUuidHost < ActiveRecord::Migration[6.0]
+
+  def up
+    execute(sql(:concat))
+  end
+
+  def down
+    execute(sql(:substring))
+  end
+
+  private 
+
+  def concat
+    "concat(h.compute_resource_id, '_', h.uuid) "
+  end
+
+  def substring
+    "substring(h.uuid, position('_' in h.uuid) + 1, length(h.uuid)) "
+  end
+
+  def sql(func_type)
+    sql = 'update hosts h set uuid = '
+    sql += send(func_type)
+    sql += 'from compute_resources cr '
+    sql += "where cr.id = h.compute_resource_id and cr.type = 'ForemanFogProxmox::Proxmox';"
+    sql
+  end
+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"]
 
@@ -46,7 +47,13 @@ module ForemanFogProxmox
         widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
         security_block :foreman_fog_proxmox do
           permission :view_compute_resource, { :compute_resources =>
-          [:ostemplates_by_node_and_storage, :isos_by_node_and_storage, :ostemplates_by_node, :isos_by_node, :storages_by_node, :iso_storages_by_node, :bridges_by_node] }
+            [: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
@@ -95,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.0'
+  VERSION = '0.13.4'
 end

data/test/functional/compute_resources_controller_test.rb

@@ -21,25 +21,25 @@ require 'test_plugin_helper'
 module ForemanFogProxmox
   class ComputeResourcesControllerTest < ActionController::TestCase
     test 'should get isos by node and storage' do
-      get :isos_by_node_and_storage, params: { :node_id => 'proxmox', :storage => 'local' }
+      get :isos_by_id_and_node_and_storage, params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node and storage' do
-      get :ostemplates_by_node_and_storage, params: { :node_id => 'proxmox', :storage => 'local' }
+      get :ostemplates_by_id_and_node_and_storage, params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get isos by node' do
-      get :isos_by_node, params: { :node_id => 'proxmox' }
+      get :isos_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node' do
-      get :ostemplates_by_node, params: { :node_id => 'proxmox' }
+      get :ostemplates_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?

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

@@ -33,7 +33,6 @@ module ForemanFogProxmox
 
       let(:host_form) do
         { 'vmid' => '100',
-          'name' => 'test',
           'type' => 'lxc',
           'node_id' => 'proxmox',
           'ostemplate_storage' => 'local',
@@ -49,7 +48,7 @@ module ForemanFogProxmox
             'cpuunits' => '',
             'arch' => 'amd64',
             'ostype' => 'debian',
-            'hostname' => '',
+            'hostname' => 'toto-tata.pve',
             'nameserver' => '',
             'searchdomain' => ''
 
@@ -88,7 +87,7 @@ module ForemanFogProxmox
       let(:container) do
         { 'vmid' => '100',
           :vmid => '100',
-          'name' => 'test',
+          'hostname' => 'toto-tata.pve',
           'type' => 'lxc',
           :type => 'lxc',
           'node_id' => 'proxmox',
@@ -148,6 +147,7 @@ module ForemanFogProxmox
         assert_equal 536_870_912, vm[:memory]
         assert_equal 'local-lvm:1073741824', vm[:rootfs]
         assert_equal 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876', vm[:net0]
+        assert_equal 'toto-tata.pve', vm[:hostname]
         assert_not vm.key?(:config)
         assert_not vm.key?(:node)
         assert_not vm.key?(:type)
@@ -165,6 +165,7 @@ module ForemanFogProxmox
           :cores => '1',
           :arch => 'amd64',
           :ostype => 'debian',
+          :hostname => 'toto-tata.pve',
           :net0 => 'name=eth0,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
           :net1 => 'name=eth1,bridge=vmbr0,ip=dhcp,ip6=dhcp,gw=192.168.56.100,gw6=2001:0:1234::c1c0:abcd:876',
           :rootfs => 'local-lvm:1073741824',