foreman_fog_proxmox 0.14.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a0629dba4c5afe29ddca15cbe49df9325edb80ca73d076c41c3fc1d283ecff
-  data.tar.gz: f680eed4c519701ecdc5bc38117ca62eb846551ab972aa8e5f38869b17fe414e
+  metadata.gz: 48f67a6be462ff0c8dcbaf74676828eb72dcb028d09984e64652eabd224f5202
+  data.tar.gz: b480687763ab5d18283b40eccd8625e117a7e057517a1de268e448de3c6de428
 SHA512:
-  metadata.gz: 6c8d56b7e0a4e02ac2195fdd248aa12f5934b8a9746763d1aff59d0df1316f09abb3dbfe212f99e7a39307132065550871bb84a7fcab04787e3e8ca9bd70e50d
-  data.tar.gz: 883ee296ceea79f15e220c8fe9cad273aed8201862be59b41b79761ae01d8cc837adcbe3dae54e9e24d1f30f34dee3d85e7eb8c83ccaa94d0522f27bc28925b3
+  metadata.gz: '0608143b5b0742f00ea77306f785d6bfa0d4023f23ce1c8331c503ba7c1a87d0039bb83b5c350ca48787509e1c0aae08942d8539b2883da85539789ffdd10f9e'
+  data.tar.gz: 4f58946907839513c8bea07021a9375a81c5bfb1a8fba62c8fc9605571626e0d62e79415a08095da8f4ac42210f99770c15a8c7f123518b20df4775f70df687a

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -37,6 +37,7 @@ module ProxmoxVmCloudinitHelper
       id = "#{controller}#{device}" if controller && device
       cloudinit_h.store(:id, id.to_sym) if id
       cloudinit_h.store(:volid, cloudinit_volid) if cloudinit_volid
+      cloudinit_h.store(:media, 'cdrom')
     end
     cloudinit_h
   end

data/app/helpers/proxmox_vm_config_helper.rb

@@ -27,11 +27,11 @@ require 'foreman_fog_proxmox/hash_collection'
 module ProxmoxVmConfigHelper
   def object_to_config_hash(vm, type)
     vm_h = ActiveSupport::HashWithIndifferentAccess.new
-    main_a = ['vmid']
-    main = vm.attributes.select { |key, _value| main_a.include? key }
+    main_a = ['vmid', 'type']
+    main = vm.attributes.select { |key, _value| main_a.include? key.to_s }
     main_a += ['templated']
     config = vm.config.attributes.reject do |key, _value|
-      main_a.include?(key) || Fog::Proxmox::DiskHelper.disk?(key) || Fog::Proxmox::NicHelper.nic?(key)
+      main_a.include?(key.to_s) || Fog::Proxmox::DiskHelper.disk?(key) || Fog::Proxmox::NicHelper.nic?(key)
     end
     vm_h = vm_h.merge(main)
     vm_h = vm_h.merge('config_attributes': config)
@@ -40,7 +40,7 @@ module ProxmoxVmConfigHelper
   end
 
   def general_a(type)
-    general_a = ['node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes']
+    general_a = ['node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes', 'image_id']
     general_a += ['firmware_type', 'provision_method', 'container_volumes', 'server_volumes', 'start_after_create']
     general_a += ['name'] if type == 'lxc'
     general_a
@@ -126,6 +126,11 @@ module ProxmoxVmConfigHelper
   def parse_typed_memory(args, type)
     ForemanFogProxmox::HashCollection.remove_empty_values(args)
     logger.debug("parse_typed_memory(#{type}): args=#{args}")
+    # Convert balloon value from bytes to expected MiB if its not already
+    if args.key?('balloon')
+      mb = (args['balloon'].to_i / 1024**2).to_s
+      args['balloon'] = (mb == '0') ? args['balloon'] : mb
+    end
     args
   end
 

data/app/helpers/proxmox_vm_interfaces_helper.rb

@@ -56,7 +56,7 @@ module ProxmoxVmInterfacesHelper
   end
 
   def interface_common_typed_keys(type)
-    [{ origin: 'id', dest: 'id' }, { origin: 'mac', dest: type == 'qemu' ? 'macaddr' : 'hwaddr' }]
+    ['id', type == 'qemu' ? 'macaddr' : 'hwaddr']
   end
 
   def compute_dhcps(interface_attributes_h)
@@ -80,8 +80,8 @@ module ProxmoxVmInterfacesHelper
       interfaces_to_delete.push(id.to_s)
     else
       interface_common_typed_keys(type).each do |key|
-        ForemanFogProxmox::HashCollection.add_and_format_element(nic, key[:dest].to_sym, interface_attributes,
-          key[:origin])
+        ForemanFogProxmox::HashCollection.add_and_format_element(nic, key.to_sym, interface_attributes,
+          key)
       end
       interface_attributes_h = interface_attributes['compute_attributes']
       if ForemanFogProxmox::Value.empty?(interface_attributes['compute_attributes'])

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

@@ -53,7 +53,7 @@ module FogExtensions
       end
 
       def state
-        qmpstatus
+        status
       end
 
       delegate :description, to: :config

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -154,7 +154,7 @@ module ForemanFogProxmox
       raise ::Foreman::Exception, 'User token expired' if token_expired?(e)
     rescue StandardError => e
       logger.warn("failed to create compute client: #{e}")
-      raise e
+      raise ::Foreman::Exception, error_message(e)
     end
 
     def identity_client
@@ -163,7 +163,7 @@ module ForemanFogProxmox
       raise ::Foreman::Exception, 'User token expired' if token_expired?(e)
     rescue StandardError => e
       logger.warn("failed to create identity client: #{e}")
-      raise e
+      raise ::Foreman::Exception, error_message(e)
     end
 
     def network_client
@@ -172,7 +172,13 @@ module ForemanFogProxmox
       raise ::Foreman::Exception, 'User token expired' if token_expired?(e)
     rescue StandardError => e
       logger.warn("failed to create network client: #{e}")
-      raise e
+      raise ::Foreman::Exception, error_message(e)
+    end
+
+    def error_message(e)
+      "Failed to create Proxmox compute resource: #{e.message}.
+       Either provided credentials or FQDN is wrong or
+       your server cannot connect to Proxmox due to network issues."
     end
 
     def host

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -41,7 +41,7 @@ ostype: ostype)
     end
 
     def interface_compute_attributes(interface_attributes)
-      vm_attrs = ForemanFogProxmox::HashCollection.new_hash_reject_keys(interface_attributes, [:identifier, :mac])
+      vm_attrs = ForemanFogProxmox::HashCollection.new_hash_reject_keys(interface_attributes, [:identifier, :macaddr, :hwaddr])
       vm_attrs[:dhcp] = interface_attributes[:ip] == 'dhcp' ? '1' : '0'
       vm_attrs[:dhcp6] = interface_attributes[:ip6] == 'dhcp' ? '1' : '0'
       vm_attrs

data/app/models/foreman_fog_proxmox/proxmox_console.rb

@@ -31,7 +31,9 @@ module ForemanFogProxmox
       options.store(:websocket, 1) if type_console == 'vnc'
       begin
         vnc_console = vm.start_console(options)
-        WsProxy.start(:host => host, :host_port => vnc_console['port'], :password => vnc_console['ticket']).merge(
+        vmid = extract_vmid(uuid).to_i
+        vnc_host_port = vnc_console['port'].to_i + vmid
+        WsProxy.start(:host => host, :host_port => vnc_host_port, :password => vnc_console['ticket']).merge(
           :name => vm.name, :type => type_console
         )
       rescue StandardError => e

data/app/models/foreman_fog_proxmox/proxmox_images.rb

@@ -47,8 +47,9 @@ module ForemanFogProxmox
     def templates
       volumes = []
       nodes.each do |node|
-        storage = storages(node.node).first
-        volumes += storage.volumes.list_by_content_type('images')
+        storages(node.node).each do |storage|
+          volumes += storage.volumes.list_by_content_type('images')
+        end
       end
       volumes.select(&:template?)
     end
@@ -57,15 +58,11 @@ module ForemanFogProxmox
       find_vm_by_uuid(uuid)
     end
 
-    def clone_from_image(image_id, args, vmid)
+    def clone_from_image(image_id, vmid)
       logger.debug("create_vm(): clone #{image_id} in #{vmid}")
       image = find_vm_by_uuid(image_id)
       image.clone(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?
-      clone.update(options)
+      find_vm_by_uuid(id.to_s + '_' + vmid.to_s)
     end
   end
 end

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -39,26 +39,36 @@ module ForemanFogProxmox
       raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
 
       image_id = args[:image_id]
+      remove_volume_keys(args)
       if image_id
-        clone_from_image(image_id, args, vmid)
+        vm = clone_from_image(image_id, vmid)
+        vm.update(compute_clone_attributes(args, vm.container?, type))
+        update_pool(vm, args[:pool]) if args[:pool]
       else
-        remove_volume_keys(args)
         logger.warn("create vm: args=#{args}")
         vm = node.send(vm_collection(type)).create(parse_typed_vm(args, type))
-        start_on_boot(vm, args)
       end
+      start_on_boot(vm, args)
     rescue StandardError => e
       logger.warn("failed to create vm: #{e}")
-      destroy_vm client.identity + '_' + vm.id if vm
+      destroy_vm id.to_s + '_' + vm.vmid.to_s if vm
       raise e
     end
 
+    def compute_clone_attributes(args, container, type)
+      parsed_args = parse_typed_vm(args, type)
+      if container
+        options = { :hostname => args[:name] }
+        parsed_args.merge(options)
+      end
+      parsed_args.reject { |k| k == 'pool' }
+    end
+
     def destroy_vm(uuid)
       vm = find_vm_by_uuid(uuid)
-      unless vm.nil?
-        vm.stop if vm.ready?
-        vm.destroy
-      end
+      return true if vm.nil?
+      vm.stop if vm.ready?
+      vm.destroy
     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

@@ -142,7 +142,7 @@ module ForemanFogProxmox
         config_attributes = {
           cores: '1',
           sockets: '1',
-          kvm: '0',
+          kvm: '1',
           vga: 'std',
           memory: '1024',
           ostype: 'l26',

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -104,12 +104,14 @@ module ForemanFogProxmox
 
     def volume_exists?(vm, volume_attributes)
       disk = vm.config.disks.get(volume_attributes['id'])
-      exists = false
-      return exists unless disk
+      return false unless disk
 
-      exists = !volume_attributes['volid'].empty? if disk.hard_disk? || disk.cloud_init?
-      exists = !volume_attributes['cdrom'].empty? if disk.cdrom?
-      exists
+      # Return boolean if disk of type hard_disk, cloud_init, cdrom or rootfs(LXC container) exists
+      if disk.hard_disk? || disk.cloud_init? || disk.rootfs?
+        volume_attributes['volid'].present?
+      elsif disk.cdrom?
+        volume_attributes['cdrom'].present?
+      end
     end
 
     def volume_to_delete?(volume_attributes)

data/app/views/compute_resources/form/_proxmox.html.erb

@@ -38,5 +38,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
 <% end %>
 <div class="col-md-offset-2">
-  <%= test_connection_button_f(f, (f.object.nodes rescue false)) %>
+  <%= test_connection_button_f(f, (f.object.nodes rescue true)) %>
 </div>

data/app/views/compute_resources_vms/form/proxmox/_general.html.erb

@@ -21,7 +21,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= checkbox_f f, :templated, :label => _('Create image?'), :disabled => untemplatable, :class => ('hide' if untemplatable), :no_label => untemplatable %>
   <%= counter_f f, :vmid, :label => _('VM ID'), :label_size => "col-md-2", :required => true, :disabled => (!new_vm || from_profile) %>
   <%= select_f f, :node_id, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :onchange => 'nodeSelected(this)' %>
-  <%= checkbox_f f, :start_after_create, :label => _('Start after creation?'), :disabled => !new_vm, :class => ('hide' if !new_vm), :no_label => !new_vm %>
+  <% unless !new_vm || from_profile %>
+    <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start_after_create] || '1' %>
+    <%= checkbox_f f, :start_after_create, {:checked => (checked == '1'), :label => _('Start after creation?')} %>
+  <% end %>
   <% unless local_assigns[:hide_image] && !new_vm %>
     <%
       arch ||= nil ; os ||= nil

data/app/views/compute_resources_vms/form/proxmox/container/_network.html.erb

@@ -27,8 +27,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= checkbox_f f, :dhcp6, :label => _('DHCP IPv6') %>
     <%= text_f f, :cidr6, :label => _('CIDR IPv6'), :label_size => "col-md-2", :label_help => _("integer within [0..128]")%>
     <%= text_f f, :gw6, :label => _('Gateway IPv6'), :label_size => "col-md-2" %>
-    <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
-    <%= counter_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
+    <%= text_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
+    <%= text_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
     <%= checkbox_f f, :firewall, :label => _('Firewall') %>
     <%= select_f f, :bridge, compute_resource.bridges(node_id), :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
 <% end %>

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

@@ -22,9 +22,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= text_f f, :id, :label => _('Identifier'), :label_size => "col-md-2", :required => true, :label_help => _("net[n] with n integer >= 0, e.g. net0") %>
     <%= select_f f, :model, proxmox_networkcards_map, :id, :name, { }, :label => _('Card'), :label_size => "col-md-2" %>
     <%= select_f f, :bridge, compute_resource.bridges(node_id), :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
-    <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
-    <%= counter_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
-    <%= counter_f f, :queues, :class => "input-mini", :label => _('Multiqueue'), :label_size => "col-md-2" %>
+    <%= text_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
+    <%= text_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
+    <%= text_f f, :queues, :class => "input-mini", :label => _('Multiqueue'), :label_size => "col-md-2" %>
     <%= checkbox_f f, :firewall, { :label => _('Firewall') }, '1', '0' %>
     <%= checkbox_f f, :link_down, { :label => _('Disconnect') }, '1', '0' %>
 <% end %>

data/lib/foreman_fog_proxmox/engine.rb

@@ -40,13 +40,15 @@ module ForemanFogProxmox
     initializer 'foreman_fog_proxmox.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_fog_proxmox do
         requires_foreman '>= 1.22.0'
+        # Add Global files for extending foreman-core components and routes
+        register_global_js_file 'global'
         # Register Proxmox VE compute resource in foreman
         compute_resource ForemanFogProxmox::Proxmox
         parameter_filter(ComputeResource, :uuid)
         # add dashboard widget
         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 =>
+          permission :view_compute_resources, { :'foreman_fog_proxmox/compute_resources' =>
             [:ostemplates_by_id_and_node_and_storage,
              :isos_by_id_and_node_and_storage,
              :ostemplates_by_id_and_node,

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.14.1'
+  VERSION = '0.14.3'
 end

data/locale/en/foreman_fog_proxmox.po

@@ -244,7 +244,10 @@ msgstr ""
 msgid "Memory"
 msgstr ""
 
-msgid "Minimum memory"
+msgid "Memory (MB)"
+msgstr ""
+
+msgid "Minimum memory (MB)"
 msgstr ""
 
 msgid "Mount point"
@@ -340,10 +343,10 @@ msgstr ""
 msgid "Search domain"
 msgstr ""
 
-msgid "Shares"
+msgid "Shares (MB)"
 msgstr ""
 
-msgid "Size"
+msgid "Size (GB)"
 msgstr ""
 
 msgid "Sockets"
@@ -358,7 +361,7 @@ msgstr ""
 msgid "Storage"
 msgstr ""
 
-msgid "Swap"
+msgid "Swap (MB)"
 msgstr ""
 
 msgid "Template storage"
@@ -472,6 +475,12 @@ msgstr ""
 msgid "net[n] with n integer >= 0, e.g. net0"
 msgstr ""
 
+msgid "new_typed_vm(%<type>s) with vm_typed_instance_defaults: vm_h=%<vm_h>s"
+msgstr ""
+
+msgid "parse_hard_disk_volume(): args=%<args>s"
+msgstr ""
+
 msgid "remove CDROM"
 msgstr ""
 

data/locale/foreman_fog_proxmox.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_fog_proxmox 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-07 18:29+0100\n"
-"PO-Revision-Date: 2022-12-07 18:29+0100\n"
+"POT-Creation-Date: 2022-12-16 17:29+0100\n"
+"PO-Revision-Date: 2022-12-16 17:29+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -89,6 +89,10 @@ msgstr ""
 msgid "Change the password"
 msgstr ""
 
+#: ../app/helpers/proxmox_vm_volumes_helper.rb:52
+msgid "parse_hard_disk_volume(): args=%<args>s"
+msgstr ""
+
 #: ../app/models/concerns/fog_extensions/proxmox/server.rb:62
 msgid "Type %<type>s, node %<node>s, %<cpus>s CPUs and %<memory>s MB memory"
 msgstr ""
@@ -129,10 +133,15 @@ msgstr ""
 msgid "invalid vmid=%<vmid>s"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:79
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_new.rb:199
+msgid "new_typed_vm(%<type>s) with vm_typed_instance_defaults: vm_h=%<vm_h>s"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:78
 msgid "Failed retrieving proxmox server vm by vmid=%<vmid>s"
 msgstr ""
 
+#: ../app/models/foreman_fog_proxmox/proxmox_volumes.rb:88
 #: ../app/models/foreman_fog_proxmox/proxmox_volumes.rb:91
 msgid "Unable to shrink %<id>s size. Proxmox allows only increasing size."
 msgstr ""
@@ -365,10 +374,8 @@ msgstr ""
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:10
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:15
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:16
 #: ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:10
 #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:32
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:33
 #: ../app/views/compute_resources_vms/index/_proxmox.html.erb:10
 msgid "Memory"
 msgstr ""
@@ -418,9 +425,15 @@ msgstr ""
 msgid "CPU units"
 msgstr ""
 
+#:
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:16
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:33
+msgid "Memory (MB)"
+msgstr ""
+
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:17
-msgid "Swap"
+msgid "Swap (MB)"
 msgstr ""
 
 #:
@@ -598,7 +611,7 @@ msgstr ""
 #: ../app/views/compute_resources_vms/form/proxmox/container/_volume_mp.html.erb:11
 #: ../app/views/compute_resources_vms/form/proxmox/container/_volume_rootfs.html.erb:8
 #: ../app/views/compute_resources_vms/form/proxmox/server/_volume_hard_disk.html.erb:16
-msgid "Size"
+msgid "Size (GB)"
 msgstr ""
 
 #:
@@ -660,11 +673,11 @@ msgid "CPU Flags"
 msgstr ""
 
 #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:34
-msgid "Minimum memory"
+msgid "Minimum memory (MB)"
 msgstr ""
 
 #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
-msgid "Shares"
+msgid "Shares (MB)"
 msgstr ""
 
 #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:40

data/locale/fr/foreman_fog_proxmox.po

@@ -244,8 +244,11 @@ msgstr ""
 msgid "Memory"
 msgstr "Mémoire"
 
-msgid "Minimum memory"
-msgstr "Mémoire minimale"
+msgid "Memory (MB)"
+msgstr ""
+
+msgid "Minimum memory (MB)"
+msgstr ""
 
 msgid "Mount point"
 msgstr "Point de montage"
@@ -340,11 +343,11 @@ msgstr ""
 msgid "Search domain"
 msgstr "Domaine de recherche"
 
-msgid "Shares"
-msgstr "Partages"
+msgid "Shares (MB)"
+msgstr ""
 
-msgid "Size"
-msgstr "Taille"
+msgid "Size (GB)"
+msgstr ""
 
 msgid "Sockets"
 msgstr ""
@@ -358,7 +361,7 @@ msgstr "Démarrer au boot"
 msgid "Storage"
 msgstr "Stockage"
 
-msgid "Swap"
+msgid "Swap (MB)"
 msgstr ""
 
 msgid "Template storage"
@@ -472,6 +475,12 @@ msgstr "vmid=%<vmid>s incorrect"
 msgid "net[n] with n integer >= 0, e.g. net0"
 msgstr ""
 
+msgid "new_typed_vm(%<type>s) with vm_typed_instance_defaults: vm_h=%<vm_h>s"
+msgstr ""
+
+msgid "parse_hard_disk_volume(): args=%<args>s"
+msgstr ""
+
 msgid "remove CDROM"
 msgstr ""
 

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

@@ -140,8 +140,8 @@ module ForemanFogProxmox
     describe 'object_to_config_hash' do
       setup { Fog.mock! }
       teardown { Fog.unmock! }
-      excluded_qemu_keys = ['templated', 'ide2', 'scsi0', 'net0', 'net1']
-      excluded_lxc_keys = ['templated', 'rootfs', 'mp0', 'net0', 'net1']
+      excluded_qemu_keys = ['vmid', 'type', 'templated', 'ide2', 'scsi0', 'net0', 'net1']
+      excluded_lxc_keys = ['vmid', 'type', 'templated', 'rootfs', 'mp0', 'net0', 'net1']
 
       it '#server qemu' do
         config_hash = object_to_config_hash(server, 'qemu')

data/test/unit/foreman_fog_proxmox/proxmox_images_test.rb

@@ -27,7 +27,6 @@ module ForemanFogProxmox
     describe 'clone_from_image' do
       before do
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
-        @args = { :name => 'name' }
         @image_id = @cr.id.to_s + '_' + 100.to_s
         @vmid = 101
         @image = mock('vm')
@@ -36,16 +35,14 @@ module ForemanFogProxmox
         @clone = mock('vm')
       end
       it 'clones server from image' do
-        @clone.expects(:update).with(:name => 'name')
         @clone.stubs(:container?).returns(false)
         @cr.stubs(:find_vm_by_uuid).with(@cr.id.to_s + '_' + @vmid.to_s).returns(@clone)
-        @cr.clone_from_image(@image_id, @args, @vmid)
+        @cr.clone_from_image(@image_id, @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(@cr.id.to_s + '_' + @vmid.to_s).returns(@clone)
-        @cr.clone_from_image(@image_id, @args, @vmid)
+        @cr.clone_from_image(@image_id, @vmid)
       end
     end
   end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb

@@ -291,8 +291,14 @@ module ForemanFogProxmox
         args = { vmid: '100', type: 'lxc', image_id: '999', name: 'name' }
         servers = mock('servers')
         servers.stubs(:id_valid?).returns(true)
-        cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
-        cr.expects(:clone_from_image).with('999', args, 100)
+        containers = mock('containers')
+        cr = mock_node_servers_containers(ForemanFogProxmox::Proxmox.new, servers, containers)
+        vm = mock('vm')
+        cr.expects(:clone_from_image).with('999', 100).returns(vm)
+        vm.expects(:container?).returns(true)
+        expected_args = { :vmid => "100", :type => "lxc" }
+        cr.stubs(:parse_typed_vm).with(args, 'lxc').returns(expected_args)
+        vm.expects(:update).with(expected_args)
         cr.create_vm(args)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -96,9 +96,15 @@ module ForemanFogProxmox
       it 'clones server' do
         args = { vmid: '100', type: 'qemu', image_id: '999', name: 'name' }
         servers = mock('servers')
+        containers = mock('containers')
         servers.stubs(:id_valid?).returns(true)
-        cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
-        cr.expects(:clone_from_image).with('999', args, 100)
+        cr = mock_node_servers_containers(ForemanFogProxmox::Proxmox.new, servers, containers)
+        vm = mock('vm')
+        cr.expects(:clone_from_image).with('999', 100).returns(vm)
+        vm.expects(:container?).returns(false)
+        expected_args = { :vmid => "100", :type => "qemu", :name => "name" }
+        cr.stubs(:parse_typed_vm).with(args, 'qemu').returns(expected_args)
+        vm.expects(:update).with(expected_args)
         cr.create_vm(args)
       end
     end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb

@@ -44,6 +44,7 @@ module ForemanFogProxmox
         disk.stubs(:id).returns('ide2')
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
+        disk.stubs(:rootfs?).returns(false)
         disks.stubs(:get).returns
         config.stubs(:disks).returns(disks)
         config.stubs(:attributes).returns(:cores => '')
@@ -93,6 +94,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:cloud_init?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:volid).returns('local-lvm:iso/ubuntu-20_4.iso')
@@ -145,6 +147,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:cloud_init?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:volid).returns('local-lvm:iso/ubuntu-20_4.iso')

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb

@@ -24,12 +24,13 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateHardDiskTest < ActiveSupport::TestCase
+  class ProxmoxVmCommandsServerUpdateHardDiskTest < ActiveSupport::TestCase # rubocop:disable Metrics/ClassLength
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxVmHelper
 
+    # rubocop:disable Metrics/BlockLength
     describe 'save_vm' do
       before do
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
@@ -43,6 +44,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:id).returns('scsi0')
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: '1')
@@ -94,6 +96,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:id).returns('virtio0')
         disks.stubs(:get).returns(disk)
@@ -147,6 +150,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('scsi0')
         disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
         disk.stubs(:id).returns('local-lvm')
@@ -202,6 +206,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('2')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: '2')
@@ -254,8 +259,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
-        disk.stubs(:hard_disk?).returns(true)
-        disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: '1', volid: 'local-lvm:vm-100-disk-0')
         disks.stubs(:get).returns(disk)
@@ -307,6 +311,7 @@ module ForemanFogProxmox
         disk.stubs(:size).returns('1')
         disk.stubs(:hard_disk?).returns(true)
         disk.stubs(:cdrom?).returns(false)
+        disk.stubs(:rootfs?).returns(false)
         disk.stubs(:storage).returns('local-lvm')
         disk.stubs(:volid).returns('local-lvm:vm-100-disk-0')
         disk.stubs(:id).returns('scsi0')
@@ -352,5 +357,6 @@ module ForemanFogProxmox
         @cr.save_vm(uuid, new_attributes)
       end
     end
+    # rubocop:enable Metrics/BlockLength
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.3
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -262,29 +262,29 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/functional/compute_resources_controller_test.rb
+- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
 - test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
 - test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
-- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
 - test/factories/proxmox_factory.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
 - 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_uuid_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/semver_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
+- test/unit/foreman_fog_proxmox/semver_test.rb
+- test/functional/compute_resources_controller_test.rb
 - test/test_plugin_helper.rb