foreman_fog_proxmox 0.13.0 → 0.13.4

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_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 }

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.4
 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-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
@@ -114,12 +116,15 @@ 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
 - 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
@@ -145,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
@@ -178,6 +184,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 +206,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
@@ -234,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
@@ -248,6 +256,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