foreman_fog_proxmox 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6101f16731ab275d2adfb1b0abc8fd25690688e34569b7f63c360fb6442da5ec
-  data.tar.gz: 62bfd05f02a526de1a4decc27d5a8c6ee5539b58316fb0bc29338dc26f4c0a04
+  metadata.gz: 6ee2ea48049134a2a429baa88bd6f3299c321f38a5f3532c8c17d1a3012dc277
+  data.tar.gz: 246a3ee1a5bb9f7f99e55b7f97f637cae3b49b12e7917667444238ae007e21e6
 SHA512:
-  metadata.gz: d46aa0181a540105670a8b4cc988f791cde9ac05d8323c2eec250d53ee44c1b1eaea581619276f21cc7a433931470007019e2e3028ece8f750b4fcef704398ac
-  data.tar.gz: ce879270338d08b684991184079b8106519de9394c4e85b8cfcc74e5e30620a75d217eefa8ce8301711b30fbcd20ef051925a3190ae5b8b34e4c4157a1a3895c
+  metadata.gz: b7ba0a9c31049f222e8cd06fd411356ae1302dcf1b9b0acfe0be8498d514c39e3c54373d8603484183c01318bff6c9ad4b18c8366f28916ffa05976e87b62914
+  data.tar.gz: 66d723e3135509e731e663438fa5d5cd3f79464641e4470c7b8f7908d744ba04d069a579c334140acc1b927c408208fa91cac5e30daf27998cb64f91575b9fc8

data/README.md

@@ -32,7 +32,8 @@ You can support the plugin development via the following methods:
 |>=0.10 |>=5.4|>=0.9.4|>=1.22|>=2.5|
 |>=0.11 |>=5.4|>=0.10|>=1.22|>=2.5|
 |>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
-|>=0.14 |>=6.2|>=0.13|>=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|
 
 ## Installation
 
@@ -136,6 +137,7 @@ gem 'foreman_fog_proxmox', :path => '../../theforeman/foreman_fog_proxmox'
 gem 'fog-proxmox', :path => '../../fog/fog-proxmox' # optional if you need to modify fog-proxmox code too
 gem 'ruby-debug-ide' # dev
 gem 'debase' # dev
+gem 'solargraph' # dev
 gem 'simplecov' # test
 ```
 
@@ -143,8 +145,9 @@ gem 'simplecov' # test
 
 ```shell
 gem install bundler
-# prerequisites postgresql-client library on OS
+# prerequisites postgresql-XX-client library on OS (XX=major release installed in OS)
 bundle config set without 'libvirt ovirt mysql2'
+bundle config build.pg --with-pg-config=/usr/pgsql-XX/bin/pg_config
 bundle install
 ```
 
@@ -177,7 +180,7 @@ cp config/model.mappings.example config/model.mappings
 cp config/database.yml.example config/database.yml
 ```
 
-add these lines to config/database.yml:
+add these lines to each environment in config/database.yml:
 
 ```yaml
     username: foreman
@@ -188,6 +191,7 @@ add these lines to config/database.yml:
 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
 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
 ```
 
@@ -206,7 +210,15 @@ docker exec -it foreman-db psql -U foreman
 foreman=# create database "foreman-test";
 ```
 
-all:
+then add test schema and seeds:
+
+```shell
+RAILS_ENV=test bundle exec bin/rake db:migrate
+# reboot if error: "ActiveRecord::RecordNotFound: Couldn't find Setting with [WHERE "settings"."name" = $1]"
+RAILS_ENV=test bundle exec bin/rake db:seed
+```
+
+Finally you can test all:
 
 ```shell
 export DISABLE_SPRING=true
@@ -274,6 +286,12 @@ bundle exec bin/rails server
 bundle exec foreman start
 ```
 
+If you want to delete vm on host destroy, add this line in config/settings.yml:
+
+```yml
+:destroy_vm_on_host_delete: false
+```
+
 See details in [foreman plugin development](https://projects.theforeman.org/projects/foreman/wiki/How_to_Create_a_Plugin)
 
 ## Contributing

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_compute_resource.js

@@ -36,20 +36,32 @@ function sslVerifyPeerSelected() {
   }
 }
 
+function enableField(id) {
+  $(id).show();
+  $(id).removeAttr('disabled');
+}
+
+function disableField(id) {  
+  $(id).hide();
+  $(id).attr('disabled','disabled');
+}
+
+function toggleFieldset(method, selected){
+  return method === selected ? enableField(authMethodFieldsetId(method)) : disableField(authMethodFieldsetId(method));
+}
+
+function authMethods(){
+  return ['user_token', 'access_ticket'];
+}
+
+function authMethodFieldsetId(method){
+  return '#compute_ressource_' + method + '_field_set';
+}
+
 function authMethodSelected() {
   var selected = $("#compute_resource_auth_method").val();
   console.log("auth_method="+selected);
-  var compute_ressource_user_token_field_set = $('#compute_ressource_user_token_field_set');
-  var compute_ressource_access_ticket_field_set = $('#compute_ressource_access_ticket_field_set');
-  if (selected == 'user_token') {
-    compute_ressource_user_token_field_set.show();
-    compute_ressource_user_token_field_set.removeAttr('disabled');
-    compute_ressource_access_ticket_field_set.hide();
-    compute_ressource_access_ticket_field_set.attr('disabled','disabled');
-  } else {
-    compute_ressource_access_ticket_field_set.show();
-    compute_ressource_access_ticket_field_set.removeAttr('disabled');
-    compute_ressource_user_token_field_set.hide();
-    compute_ressource_user_token_field_set.attr('disabled','disabled');
-  }
+  authMethods().forEach(function(method){
+    toggleFieldset(method, selected);
+  });
 }

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm.js

@@ -228,7 +228,9 @@ function updateOptions(options_path, start_options_id, end_options_id, start_sec
   if ( start_second_options_id != undefined && end_second_options_id != undefined) {
     select_second_ids = selectIds(start_second_options_id, end_second_options_id);
   }
-  var url = '/foreman_fog_proxmox/' + options_path +  '/' + node_id;
+  var compute_resource_id = $("#host_compute_resource_id").val();
+  if (compute_resource_id == undefined) compute_resource_id = $("#compute_attribute_compute_resource_id").val(); // profil
+  var url = '/foreman_fog_proxmox/' + options_path +  '/' + compute_resource_id +  '/' + node_id;
   if (second_id != undefined) url += '/' + second_id;
   tfm.tools.showSpinner();
   $.getJSON({

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -19,59 +19,57 @@
 
 module ForemanFogProxmox
   class ComputeResourcesController < ::ApplicationController
-    before_action :load_compute_resource
-
-    # GET foreman_fog_proxmox/isos/:node_id/:storage
-    def isos_by_node_and_storage
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'iso')
+    # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id/:storage
+    def isos_by_id_and_node_and_storage
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/ostemplates/:node_id/:storage
-    def ostemplates_by_node_and_storage
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'vztmpl')
+    # GET foreman_fog_proxmox/ostemplates/:compute_resource_id/:node_id/:storage
+    def ostemplates_by_id_and_node_and_storage
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'vztmpl')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/isos/:node_id
-    def isos_by_node
-      volumes = @compute_resource.images_by_storage(params[:node_id], params[:storage], 'iso')
+    # GET foreman_fog_proxmox/isos/:compute_resource_id/:node_id
+    def isos_by_id_and_node
+      volumes = load_compute_resource(params[:compute_resource_id]).images_by_storage(params[:node_id], params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
     end
 
-    # GET foreman_fog_proxmox/ostemplates/:node_id
-    def ostemplates_by_node
-      storages = @compute_resource.storages(params[:node_id], 'vztmpl')
+    # GET foreman_fog_proxmox/ostemplates/:compute_resource_id/:node_id
+    def ostemplates_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id], 'vztmpl')
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/storages/:node_id
-    def storages_by_node
-      storages = @compute_resource.storages(params[:node_id])
+    # GET foreman_fog_proxmox/storages/:compute_resource_id/:node_id
+    def storages_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id])
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/isostorages/:node_id
-    def iso_storages_by_node
-      storages = @compute_resource.storages(params[:node_id], 'iso')
+    # GET foreman_fog_proxmox/isostorages/:compute_resource_id/:node_id
+    def iso_storages_by_id_and_node
+      storages = load_compute_resource(params[:compute_resource_id]).storages(params[:node_id], 'iso')
       respond_to do |format|
         format.json { render :json => storages }
       end
     end
 
-    # GET foreman_fog_proxmox/bridges/:node_id
-    def bridges_by_node
-      bridges = @compute_resource.bridges(params[:node_id])
+    # GET foreman_fog_proxmox/bridges/:compute_resource_id/:node_id
+    def bridges_by_id_and_node
+      bridges = load_compute_resource(params[:compute_resource_id]).bridges(params[:node_id])
       respond_to do |format|
         format.json { render :json => bridges }
       end
@@ -79,8 +77,8 @@ module ForemanFogProxmox
 
     private
 
-    def load_compute_resource
-      @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
+    def load_compute_resource(compute_resource_id)
+      ComputeResource.find(compute_resource_id)
     end
   end
 end

data/app/helpers/proxmox_vm_config_helper.rb

@@ -31,7 +31,7 @@ module ProxmoxVmConfigHelper
 
   def object_to_config_hash(vm, type)
     vm_h = ActiveSupport::HashWithIndifferentAccess.new
-    main_a = ['hostname', 'name', 'vmid']
+    main_a = ['vmid']
     main = vm.attributes.select { |key, _value| main_a.include? key }
     main_a += ['templated']
     config = vm.config.attributes.reject { |key, _value| main_a.include?(key) || Fog::Proxmox::DiskHelper.disk?(key) || Fog::Proxmox::NicHelper.nic?(key) }
@@ -47,14 +47,15 @@ module ProxmoxVmConfigHelper
     config_hash.store(key, memory)
   end
 
-  def general_a
-    general_a = ['name', 'node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes']
+  def general_a(type)
+    general_a = ['node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes']
     general_a += ['firmware_type', 'provision_method', 'container_volumes', 'server_volumes', 'start_after_create']
+    general_a += ['name'] if type == 'lxc'
     general_a
   end
 
   def config_typed_keys(type)
-    keys = { general: general_a }
+    keys = { general: general_a(type) }
     main_a = ['name', 'type', 'node_id', 'vmid', 'interfaces', 'mount_points', 'disks']
     case type
     when 'lxc'

data/app/helpers/proxmox_vm_uuid_helper.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Copyright 2018 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 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: '' }
+    captures_h ? captures_h[name] : ''
+  end
+
+  def match_uuid?(uuid)
+    extract(uuid, :cluster_id) != ''
+  end
+
+  def extract_vmid(uuid)
+    extract(uuid, :vmid)
+  end
+end

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

@@ -23,6 +23,10 @@ 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
+      end
+
       def start
         action('start')
       end

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

@@ -38,6 +38,54 @@ module Orchestration
       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
+
+      def empty_provided_ips?(ip, ip6)
+        ip.blank? && ip6.blank? && (compute_provides?(:ip) || compute_provides?(:ip6))
+      end
+
+      def ips_keys
+        [:ip, :ip6]
+      end
+
+      def computeIp(foreman_attr, fog_attr)
+        vm.send(fog_attr) || find_address(foreman_attr)
+      end
+
+      def computeValue(foreman_attr, fog_attr)
+        value = ''
+        value += compute_resource.id.to_s + '_' if foreman_attr == :uuid
+        value += vm.send(fog_attr)
+        value
+      end
+
+      def setVmDetails
+        attrs = compute_resource.provided_attributes
+        result = true
+        attrs.each do |foreman_attr, fog_attr|
+          if foreman_attr == :mac
+            result = false unless match_macs_to_nics(fog_attr)
+          elsif ips_keys.include?(foreman_attr)
+            value = computeIp(foreman_attr, fog_attr)
+            send("#{foreman_attr}=", value)
+            result = false if send(foreman_attr).present? && !validate_foreman_attr(value, ::Nic::Base, foreman_attr)
+          else
+            value = computeValue(foreman_attr, fog_attr)
+            send("#{foreman_attr}=", value)
+            result = false unless validate_required_foreman_attr(value, Host, foreman_attr)
+          end
+        end
+        return failure(format(_('Failed to acquire IP addresses from compute resource for %<name>s'), name: name)) if empty_provided_ips?(ip, ip6)
+
+        result
+      end
+
+      def setComputeDetails
+        if vm
+          setVmDetails
+        else
+          failure format(_('failed to save %<name>s'), name: name)
+        end
+      end
     end
   end
 end

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -26,6 +26,7 @@ module ForemanFogProxmox
       when 'lxc'
         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

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -50,7 +50,7 @@ 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
 

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
@@ -51,25 +52,26 @@ module ForemanFogProxmox
     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/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/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

@@ -46,7 +46,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

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.1'
 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',

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

@@ -33,10 +33,11 @@ module ForemanFogProxmox
 
       let(:host_form) do
         { 'vmid' => '100',
-          'name' => 'test',
+          'name' => 'toto-tata.pve',
           'node_id' => 'proxmox',
           'type' => 'qemu',
           'config_attributes' => {
+            'name' => 'toto-tata.pve',
             'memory' => '536870912',
             'balloon' => '268435456',
             'shares' => '5',
@@ -111,6 +112,7 @@ module ForemanFogProxmox
         assert_equal 5, vm[:shares]
         assert_equal 'local-lvm:1073741824,cache=none', vm[:scsi0]
         assert_equal 'model=virtio,bridge=vmbr0,firewall=0,link_down=0', vm[:net0]
+        assert_equal 'toto-tata.pve', vm[:name]
         assert_not vm.key?(:config)
         assert_not vm.key?(:node)
       end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Copyright 2018 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/>.
+
+require 'test_plugin_helper'
+
+module ForemanFogProxmox
+  class ProxmoxVmUuidHelperTest < ActiveSupport::TestCase
+    include ProxmoxVmUuidHelper
+
+    describe 'extract_vmid' do
+      setup { Fog.mock! }
+      teardown { Fog.unmock! }
+
+      it '#uuid=1_100 returns 100' do
+        assert_equal '100', extract_vmid('1_100')
+      end
+      it '#uuid=pve_100 returns ' do
+        assert_equal '', extract_vmid('pve_100')
+      end
+    end
+  end
+end

data/test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb

@@ -35,14 +35,14 @@ module ForemanFogProxmox
     describe 'find_vm_by_uuid' do
       it 'returns nil when the uuid does not match' do
         cr = mock_node_servers_containers(ForemanFogProxmox::Proxmox.new, empty_servers, empty_servers)
-        assert cr.find_vm_by_uuid('100').nil?
+        assert cr.find_vm_by_uuid('1_100').nil?
       end
 
       it 'raises RecordNotFound when the compute raises error' do
         exception = Fog::Errors::Error.new
         cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers_raising_exception(exception))
         assert_raises ActiveRecord::RecordNotFound do
-          cr.find_vm_by_uuid('100')
+          cr.find_vm_by_uuid('1_100')
         end
       end
 
@@ -61,7 +61,7 @@ module ForemanFogProxmox
           empty_servers, empty_servers, # node1
           servers, empty_servers        # node2
         )
-        assert_equal vm, cr.find_vm_by_uuid(args[:vmid])
+        assert_equal vm, cr.find_vm_by_uuid('1_' + args[:vmid])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -114,6 +114,7 @@ files:
 - app/helpers/proxmox_vm_helper.rb
 - app/helpers/proxmox_vm_interfaces_helper.rb
 - app/helpers/proxmox_vm_os_template_helper.rb
+- app/helpers/proxmox_vm_uuid_helper.rb
 - app/helpers/proxmox_vm_volumes_helper.rb
 - app/models/concerns/fog_extensions/proxmox/disk.rb
 - app/models/concerns/fog_extensions/proxmox/interface.rb
@@ -178,6 +179,7 @@ files:
 - app/views/dashboard/_foreman_fog_proxmox_widget.erb
 - app/views/images/form/_proxmox.html.erb
 - config/routes.rb
+- db/migrate/20210312105013_update_proxmox_uuid_host.rb
 - lib/foreman_fog_proxmox.rb
 - lib/foreman_fog_proxmox/engine.rb
 - lib/foreman_fog_proxmox/hash_collection.rb
@@ -199,6 +201,7 @@ files:
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
@@ -248,6 +251,7 @@ test_files:
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb