foreman_fog_proxmox 0.13.1 → 0.14.0

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

@@ -0,0 +1,53 @@
+# 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 HostsController
+    extend ActiveSupport::Concern
+    included do
+      prepend Overrides
+    end
+    module Overrides
+      include ForemanFogProxmox::ProxmoxVmNew
+      # Clone the host
+      def clone
+        super
+        return true unless @host.compute_resource.class == ForemanFogProxmox::Proxmox
+
+        @host.compute_attributes[:vmid] = next_vmid
+        @host.compute_attributes[:interfaces_attributes].each { |index, interface_attributes| @host.compute_attributes[:interfaces_attributes][index] = interface_attributes.merge(macaddr: nil).merge(hwaddr: nil).merge(ip: nil).merge(ip6: nil) }
+        @host.compute_attributes[:volumes_attributes].each { |index, volume_attributes| @host.compute_attributes[:volumes_attributes][index] = volume_attributes.merge(volid: nil) }
+      end
+
+      private
+
+      def bridges
+        @host.compute_resource.bridges
+      end
+
+      def nodes
+        @host.compute_resource.nodes
+      end
+
+      def storages
+        @host.compute_resource.storages
+      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/helpers/proxmox_form_helper.rb

@@ -66,7 +66,7 @@ module ProxmoxFormHelper
     opts[:"data-association"] = (type + '_' + association.to_s).to_sym
     hide = ''
     hide += '$("[data-association=' + type + '_volumes]").hide();' unless ['hard_disk', 'mp'].include?(type)
-    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();' + hide, opts)
+    link_to_function(name.to_s, 'add_child_node(this);' + hide, opts)
   end
 
   def remove_child_link_typed(name, f, type, opts = {})

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
@@ -63,7 +63,7 @@ module FogExtensions
       end
 
       def select_nic(fog_nics, nic)
-        fog_nics.find { |fog_nic| fog_nic.identity.to_s == nic.identifier }
+        fog_nics.find { |fog_nic| fog_nic.identity.to_s == nic.compute_attributes[:id] }
       end
 
       delegate :interfaces, to: :config

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
@@ -26,8 +27,10 @@ module ForemanFogProxmox
     end
 
     def set_nic_identifier(nic, index)
-      nic.identifier = format('net%<index>s', index: index) if nic.identifier.empty?
-      raise ::Foreman::Exception, _(format('Invalid identifier interface[%<index>s]. Must be net[n] with n integer >= 0', index: index)) unless Fog::Proxmox::NicHelper.nic?(nic.identifier)
+      nic.compute_attributes[:id] = format('net%<index>s', index: index) if nic.compute_attributes[:id].empty?
+      raise ::Foreman::Exception, _(format('Invalid proxmox NIC id on interface[%<index>s]. Must be net[n] with n integer >= 0', index: index)) unless Fog::Proxmox::NicHelper.nic?(nic.compute_attributes[:id])
+
+      nic.identifier = nic.compute_attributes['id'] if nic.identifier.empty?
     end
 
     def vm_type(host)
@@ -104,24 +107,23 @@ 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)
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
         set_nic_identifier(nic, index)
         set_container_interface_name(host, nic, index) if container?(host)
-        nic_compute_attributes = nic.compute_attributes.merge(id: nic.identifier)
-        ForemanFogProxmox::HashCollection.remove_empty_values(nic_compute_attributes)
+        ForemanFogProxmox::HashCollection.remove_empty_values(nic.compute_attributes)
         mac = nic.mac
         mac ||= nic.attributes['mac']
-        set_mac(nic_compute_attributes, mac, vm_type(host)) if mac.present?
-        interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.identifier } : {}
-        nic_compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
-        set_ip(host, nic, nic_compute_attributes)
-        set_ip(host, nic, nic_compute_attributes, true)
-        ForemanFogProxmox::HashCollection.remove_keys(nic_compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
-        hash.merge(index.to_s => nic_compute_attributes)
+        set_mac(nic.compute_attributes, mac, vm_type(host)) if mac.present?
+        interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.compute_attributes[:id] } : {}
+        nic.compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
+        set_ip(host, nic, nic.compute_attributes)
+        set_ip(host, nic, nic.compute_attributes, true)
+        ForemanFogProxmox::HashCollection.remove_keys(nic.compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
+        hash.merge(index.to_s => nic.compute_attributes)
       end
     end
   end

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