foreman_fog_proxmox 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d5a9b1f9b4ed97380a0fa47196d61bb4ca3b95761eeb81430332166b18cfcd
-  data.tar.gz: ff6784567daf69fc12818289768a1c8e080655dcdd5b25934ef67950701eb7e0
+  metadata.gz: af6ccc8c3f032a49324fd0c47999b1b70e768e9dd7b8c1b3893ab518cc1f2d60
+  data.tar.gz: d96cc32fd61acc5ccc76675382a25d5716e949e57c941c47998027476c655593
 SHA512:
-  metadata.gz: d5746802f2ca998ce4d516c35bb472b52e76d5c248307faf035eb7a46c1bf9b6eb31feffc7236509f7c0cf15a7af672601537c51b00fff3aff3babf2d4501231
-  data.tar.gz: 82127d47aa58601018263e066ea5149926cc4a6bdab14f54917175f5762f87d246410ea90050cca5e7021393b73c097a638df17e9a4531f7a75754991e4e7f61
+  metadata.gz: b8cda57050030292ca7b28d4c78bd4e89399451fda2094739b8826b737eb6e9cdfaba714ecbd71582e52d757ee0e9ca24eedc7249d54e0caf36c123ee76d6422
+  data.tar.gz: 6f0c6182521d0870ca30a21ccb4eb409497d6f049579b6d705c86b6ada7144415527df0cb3b741560ddfe0a25507787d7a4e122cd37f9a2661efb8aa60c8e7a0

data/app/helpers/proxmox_vm_attrs_helper.rb

@@ -114,11 +114,11 @@ module ProxmoxVmAttrsHelper
       start_after_create: vms.start_after_create,
       templated: vms.templated,
     }
-    vms_keys = [:pool, :start_after_create]
+    vms_keys = [:cpu_type, :nameserver, :searchdomain, :hostname]
     extra_attrs = ActiveSupport::HashWithIndifferentAccess.new
     attributes.each do |key, value|
       camel_key = key.to_s.include?('_') ? snake_to_camel(key.to_s).to_sym : key
-      nested_key = vms_keys.include?(key) ? key : "config_attributes[#{key}]"
+      nested_key = vms_keys.include?(key) ? "config_attributes[#{key}]" : key
       value = start_checked if key == :start_after_create
       extra_attrs[camel_key] = { name: "#{param_scope}[#{nested_key}]", value: value }
     end

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -118,7 +118,7 @@ module ForemanFogProxmox
     def set_mac(nic_compute_attributes, mac, type)
       mac_attr_name = { 'qemu' => :macaddr, 'lxc' => :hwaddr }
       mac_key = mac_attr_name[type] || 'mac'
-      nic_compute_attributes[mac_key] = Net::Validations.normalize_mac(mac)
+      nic_compute_attributes[mac_key] = Net::Validations.normalize_mac(mac).upcase
     end
 
     def host_interfaces_attrs(host)

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -107,7 +107,7 @@ module ForemanFogProxmox
       return false unless disk
 
       # 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?
+      if disk.hard_disk? || disk.cloud_init? || disk.rootfs? || disk.mount_point?
         volume_attributes['volid'].present?
       elsif disk.cdrom?
         volume_attributes['cdrom'].present?

data/app/overrides/compute_resources_vms/form/add_from_profile_to_compute_attributes_form.rb

@@ -20,7 +20,8 @@
 Deface::Override.new(
   virtual_path: 'compute_attributes/_compute_form',
   name: 'remove_networks_and_volumes_partial',
-  remove: "erb[loud]:contains('compute_resources_vms/form/networks'), erb[loud]:contains('compute_resources_vms/form/volumes')"
+  surround: "erb[loud]:contains('compute_resources_vms/form/networks'), erb[loud]:contains('compute_resources_vms/form/volumes')",
+  text: "<% unless compute_resource.class == ForemanFogProxmox::Proxmox %><%= render_original %><% end %>"
 )
 
 Deface::Override.new(

data/app/overrides/compute_resources_vms/form/update_react_component_to_host_form.rb

@@ -21,5 +21,6 @@ Deface::Override.new(
   :virtual_path => 'hosts/_compute',
   :name => 'update_react_component_to_virtual_machine_tab',
   :replace => "erb[loud]:contains('hosts/compute_detail')",
-  :partial => 'compute_resources_vms/form/proxmox/update_react_component_to_host_form'
+  :partial => 'compute_resources_vms/form/proxmox/update_react_component_to_host_form',
+  :original => 'c71aceb245363af92515509d25cac0c066bd58ed'
 )

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

@@ -1,5 +1,4 @@
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_fog_proxmox %>
-  <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm', "data-turbolinks-track" => true %>
 <% end %>
 <%= react_component('ProxmoxVmType', { registerComp: true }) unless @host.managed %>

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

@@ -23,4 +23,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
             locals: { f: compute, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: !compute.object.persisted?,
                      arch: host.architecture_id, os: host.operatingsystem_id } %>
+
+<!--Storage-->
+<%= render :partial => 'compute_resources_vms/form/volumes', :locals => { :f => compute, :compute_resource => compute_resource, :new_host => !compute.object.persisted?, :new_vm => !compute.object.persisted?, :item_layout => 'removable' } %>
 <% end %>

data/app/views/templates/provisioning/user_data/proxmox_user_data.erb

@@ -0,0 +1,119 @@
+<%#
+kind: user_data
+name: Proxmox UserData
+model: ProvisioningTemplate
+require:
+ - plugin: foreman_fog_proxmox
+   version: 0.16.1
+oses:
+- AlmaLinux
+- Amazon
+- CentOS
+- CentOS_Stream
+- Debian
+- Rocky
+- Ubuntu
+description: |
+  This template is used during image based provisioning with Proxmox Compute Resource, when
+  the image is configured to use user-data and network config. The output is a list of
+  cloud-init directives that cloud-init parses to configures the VM booted from the image.
+  The image must have cloud-init installed in order for this to work.
+
+  This template accepts the following parameters:
+  - ssh_pwauth: boolean (default=true unless ssh_authorized_keys)
+  - ssh_authorized_keys: string w newline seperated keys (default="")
+  - package_upgrade: boolean (default=false)
+  - reboot: boolean (default=false)
+  - skip-puppet-setup: boolean (default=false)
+-%>
+<%
+  ssh_pwauth = host_param('ssh_pwauth') ? host_param_true?('ssh_pwauth') : !host_param('ssh_authorized_keys')
+  rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
+  # safemode renderer does not support unary negation
+  puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
+  salt_enabled = host_param('salt_master') ? true : false
+  chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
+-%>
+<%
+username_to_create = host_param('username_to_create', 'root')
+password_to_create = host_param('password_to_create') || @host.root_pass
+-%>
+#cloud-config
+hostname: <%= @host.shortname %>
+fqdn: <%= @host %>
+manage_etc_hosts: true
+<% if ssh_pwauth -%>
+<%# Don't enable this in production. It is very insecure! Use ssh_authorized_keys instead...
+    http://cloudinit.readthedocs.io/en/latest/topics/examples.html#including-users-and-groups -%>
+ssh_pwauth: true
+users:
+  - name: <%= username_to_create %>
+    shell: /bin/bash
+    sudo: ALL=(ALL) ALL
+    lock_passwd: false
+    hashed_passwd: <%= password_to_create %>
+<% end -%>
+<% if host_param('ssh_authorized_keys') -%>
+ssh_authorized_keys:
+<% host_param('ssh_authorized_keys').split("\n").each do |ssh_key| -%>
+- <%= ssh_key %>
+<% end -%>
+<% end -%>
+
+<% if host_param_true?('package_upgrade') -%>
+package_upgrade: true
+<% end -%>
+
+runcmd:
+<% if rhel_compatible -%>
+- |
+<%= indent(2) { snippet('epel') } %>
+<% end -%>
+- |
+<%= indent(2) { snippet('remote_execution_ssh_keys') } %>
+<% if chef_enabled -%>
+- |
+<%= indent(2) { snippet('chef_client') } %>
+<% end -%>
+<% if puppet_enabled -%>
+- |
+<%= indent(2) { snippet('puppetlabs_repo') } %>
+- |
+<%= indent(2) { snippet('puppet_setup') } %>
+<% end -%>
+<% if salt_enabled -%>
+- |
+<%= indent(2) { snippet('saltstack_setup') } %>
+<% end -%>
+
+<%# Contact Foreman to confirm instance is built -%>
+phone_home:
+  url: <%= foreman_url('built') %>
+  post: []
+  tries: 10
+
+<% if host_param_true?('reboot') -%>
+power_state:
+  mode: reboot
+  timeout: 30
+  condition: true
+<% end -%>
+
+#network-config
+version: 2
+ethernets:
+  eth0:
+    match:
+      name: e*
+    dhcp4: false
+    dhcp6: false
+    addresses:
+      - <%= @host.ip %>/<%= @host.subnet.cidr %>
+    routes:
+      - to: 0.0.0.0
+        via: <%= @host.subnet.gateway %>
+    nameservers:
+      addresses:
+        - <%= @host.subnet.dns_primary%>
+      search:
+        - <%= @host.domain.name %>

data/db/seeds.d/71_provisioning_templates.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+ProvisioningTemplate.without_auditing do
+  SeedHelper.import_templates(
+    Dir[File.join("#{ForemanFogProxmox::Engine.root}/app/views/templates/provisioning/**/*.erb")]
+  )
+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.16.1'
+  VERSION = '0.16.3'
 end

data/test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb

@@ -54,7 +54,7 @@ module ForemanFogProxmox
 
       it 'sets interface identifier with server compute id, 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'
         compute_attributes = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0' })
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :ip => ip, :ip6 => ip6,
@@ -131,7 +131,7 @@ module ForemanFogProxmox
 
       it 'sets container compute 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 = ActiveSupport::HashWithIndifferentAccess.new({ 'id' => 'net0', 'dhcp' => '1',

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb

@@ -45,6 +45,7 @@ module ForemanFogProxmox
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
         disk.stubs(:rootfs?).returns(false)
+        disk.stubs(:mount_point?).returns(false)
         disks.stubs(:get).returns
         config.stubs(:disks).returns(disks)
         config.stubs(:attributes).returns(:cores => '')
@@ -95,6 +96,7 @@ module ForemanFogProxmox
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
         disk.stubs(:rootfs?).returns(false)
+        disk.stubs(:mount_point?).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')
@@ -148,6 +150,7 @@ module ForemanFogProxmox
         disk.stubs(:hard_disk?).returns(false)
         disk.stubs(:cdrom?).returns(true)
         disk.stubs(:rootfs?).returns(false)
+        disk.stubs(:mount_point?).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/webpack/components/GeneralTabContent.js

@@ -22,7 +22,7 @@ const GeneralTabContent = ({
       required
       type="number"
       value={general?.vmid?.value}
-      disabled={fromProfile}
+      disabled={!newVm || fromProfile}
       onChange={handleChange}
     />
     <InputField
@@ -48,7 +48,7 @@ const GeneralTabContent = ({
         label={__('Start after creation?')}
         type="checkbox"
         value={general?.startAfterCreate?.value}
-        checked={general?.startAfterCreate?.value === '1'}
+        checked={String(general?.startAfterCreate?.value) === '1'}
         onChange={handleChange}
       />
     )}
@@ -58,7 +58,7 @@ const GeneralTabContent = ({
         label={__('Create image?')}
         type="checkbox"
         value={general?.templated?.value}
-        checked={general?.templated?.value === '1'}
+        checked={String(general?.templated?.value) === '1'}
         disabled={untemplatable}
         onChange={handleChange}
       />

data/webpack/components/ProxmoxComputeSelectors.js

@@ -52,6 +52,7 @@ const ProxmoxComputeSelectors = {
   ],
 
   proxmoxVgasMap: [
+    { value: '', labal: '' },
     { value: 'std', label: 'Standard VGA' },
     { value: 'vmware', label: 'Vmware compatible' },
     { value: 'qxl', label: 'SPICE' },
@@ -74,34 +75,77 @@ const ProxmoxComputeSelectors = {
   ],
 
   proxmoxCpusMap: [
-    { value: '486', label: '486' },
     { value: 'athlon', label: 'athlon' },
+    { value: 'EPYC', label: 'EPYC' },
+    { value: 'EPYC-IBPB', label: 'EPYC-IBPB' },
+    { value: 'EPYC-Milan', label: 'EPYC-Milan' },
+    { value: 'EPYC-Rome', label: 'EPYC-Rome' },
+    { value: 'EPYC-Rome-v2', label: 'EPYC-Rome-v2' },
+    { value: 'EPYC-v3', label: 'EPYC-v3' },
+    { value: 'Opteron_G1', label: 'Opteron_G1' },
+    { value: 'Opteron_G2', label: 'Opteron_G2' },
+    { value: 'Opteron_G3', label: 'Opteron_G3' },
+    { value: 'Opteron_G4', label: 'Opteron_G4' },
+    { value: 'Opteron_G5', label: 'Opteron_G5' },
+    { value: 'phenom', label: 'phenom' },
+    { value: '486', label: '486' },
+    { value: 'Broadwell', label: 'Broadwell' },
+    { value: 'Broadwell-IBRS', label: 'Broadwell-IBRS' },
+    { value: 'Broadwell-noTSX', label: 'Broadwell-noTSX' },
+    { value: 'Broadwell-noTSX-IBRS', label: 'Broadwell-noTSX-IBRS' },
+    { value: 'Cascadelake-Server', label: 'Cascadelake-Server' },
+    { value: 'Cascadelake-Server-noTSX', label: 'Cascadelake-Server-noTSX' },
+    { value: 'Cascadelake-Server-v2', label: 'Cascadelake-Server-v2' },
+    { value: 'Cascadelake-Server-v4', label: 'Cascadelake-Server-v4' },
+    { value: 'Cascadelake-Server-v5', label: 'Cascadelake-Server-v5' },
+    { value: 'Conroe', label: 'Conroe' },
+    { value: 'Cooperlake', label: 'Cooperlake' },
+    { value: 'Cooperlake-v2', label: 'Cooperlake-v2' },
     { value: 'core2duo', label: 'core2duo' },
     { value: 'coreduo', label: 'coreduo' },
-    { value: 'kvm32', label: 'kvm32' },
-    { value: 'kvm64', label: '(Default) kvm64' },
+    { value: 'Haswell', label: 'Haswell' },
+    { value: 'Haswell-IBRS', label: 'Haswell-IBRS' },
+    { value: 'Haswell-noTSX', label: 'Haswell-noTSX' },
+    { value: 'Haswell-noTSX-IBRS', label: 'Haswell-noTSX-IBRS' },
+    { value: 'Icelake-Client', label: 'Icelake-Client' },
+    { value: 'Icelake-Client-noTSX', label: 'Icelake-Client-noTSX' },
+    { value: 'Icelake-Server', label: 'Icelake-Server' },
+    { value: 'Icelake-Server-noTSX', label: 'Icelake-Server-noTSX' },
+    { value: 'Icelake-Server-v3', label: 'Icelake-Server-v3' },
+    { value: 'Icelake-Server-v4', label: 'Icelake-Server-v4' },
+    { value: 'Icelake-Server-v5', label: 'Icelake-Server-v5' },
+    { value: 'Icelake-Server-v6', label: 'Icelake-Server-v6' },
+    { value: 'IvyBridge', label: 'IvyBridge' },
+    { value: 'IvyBridge-IBRS', label: 'IvyBridge-IBRS' },
+    { value: 'KnightsMill', label: 'KnightsMill' },
+    { value: 'Nehalem', label: 'Nehalem' },
+    { value: 'Nehalem-IBRS', label: 'Nehalem-IBRS' },
+    { value: 'Penryn', label: 'Penryn' },
     { value: 'pentium', label: 'pentium' },
     { value: 'pentium2', label: 'pentium2' },
     { value: 'pentium3', label: 'pentium3' },
-    { value: 'phenom', label: 'phenom' },
-    { value: 'qemu32', label: 'qemu32' },
-    { value: 'qemu64', label: 'qemu64' },
-    { value: 'Conroe', label: 'Conroe' },
-    { value: 'Penryn', label: 'Penryn' },
-    { value: 'Nehalem', label: 'Nehalem' },
-    { value: 'Westmere', label: 'Westmere' },
     { value: 'SandyBridge', label: 'SandyBridge' },
-    { value: 'IvyBridge', label: 'IvyBridge' },
-    { value: 'Haswell', label: 'Haswell' },
-    { value: 'Haswell-noTSX', label: 'Haswell-noTSX' },
-    { value: 'Broadwell', label: 'Broadwell' },
-    { value: 'Broadwell-noTSX', label: 'Broadwell-noTSX' },
+    { value: 'SandyBridge-IBRS', label: 'SandyBridge-IBRS' },
     { value: 'Skylake-Client', label: 'Skylake-Client' },
-    { value: 'Opteron_G1', label: 'Opteron_G1' },
-    { value: 'Opteron_G2', label: 'Opteron_G2' },
-    { value: 'Opteron_G3', label: 'Opteron_G3' },
-    { value: 'Opteron_G4', label: 'Opteron_G4' },
-    { value: 'Opteron_G5', label: 'Opteron_G5' },
+    { value: 'Skylake-Client-IBRS', label: 'Skylake-Client-IBRS' },
+    { value: 'Skylake-Client-noTSX-IBRS', label: 'Skylake-Client-noTSX-IBRS' },
+    { value: 'Skylake-Client-v4', label: 'Skylake-Client-v4' },
+    { value: 'Skylake-Server', label: 'Skylake-Server' },
+    { value: 'Skylake-Server-IBRS', label: 'Skylake-Server-IBRS' },
+    { value: 'Skylake-Server-noTSX-IBRS', label: 'Skylake-Server-noTSX-IBRS' },
+    { value: 'Skylake-Server-v4', label: 'Skylake-Server-v4' },
+    { value: 'Skylake-Server-v5', label: 'Skylake-Server-v5' },
+    { value: 'Westmere', label: 'Westmere' },
+    { value: 'Westmere-IBRS', label: 'Westmere-IBRS' },
+    { value: 'kvm32', label: 'kvm32' },
+    { value: 'kvm64', label: '(Default) kvm64' },
+    { value: 'max', label: 'max' },
+    { value: 'qemu32', label: 'qemu32' },
+    { value: 'qemu64', label: 'qemu64' },
+    { value: 'x86-64-v2', label: 'x86-64-v2' },
+    { value: 'x86-64-v2-AES', label: 'x86-64-v2-AES' },
+    { value: 'x86-64-v3', label: 'x86-64-v3' },
+    { value: 'x86-64-v4', label: 'x86-64-v4' },
     { value: 'host', label: 'host' },
   ],
 

data/webpack/components/ProxmoxContainer/MountPoint.js

@@ -45,16 +45,18 @@ const MountPoint = ({ id, data, storagesMap }) => {
       />
       <InputField
         name={mp?.size?.name}
-        label={__('Size')}
+        label={__('Size (GB)')}
         type="number"
         value={mp?.size?.value}
         onChange={handleChange}
       />
-      <input
+      <InputField
+        label={__('Device')}
         name={mp?.device?.name}
-        type="hidden"
+        disabled
         value={mp?.device?.value}
         onChange={handleChange}
+        tooltip={__('Device value is set automatically.')}
       />
       <input
         name={mp?.id?.name}
@@ -68,11 +70,6 @@ const MountPoint = ({ id, data, storagesMap }) => {
         value={mp?.volid?.value}
         onChange={handleChange}
       />
-      <input
-        name={mp?.storageType?.name}
-        type="hidden"
-        value={mp?.storageType?.value}
-      />
     </div>
   );
 };

data/webpack/components/ProxmoxContainer/ProxmoxContainerOptions.js

@@ -56,14 +56,14 @@ const ProxmoxContainerOptions = ({ options, storages, nodeId }) => {
         label={__('Start at boot')}
         type="checkbox"
         value={opts?.onboot?.value}
-        checked={opts?.onboot?.value === '1'}
+        checked={String(opts?.onboot?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
         name={opts?.ostype?.name}
         label={__('OS Type')}
         type="select"
-        options={ProxmoxComputeSelectors.proxmoxOperatingSystemsMap}
+        options={ProxmoxComputeSelectors.proxmoxOstypesMap}
         value={opts?.ostype?.value}
         onChange={handleChange}
       />
@@ -71,6 +71,7 @@ const ProxmoxContainerOptions = ({ options, storages, nodeId }) => {
         name={opts?.hostname?.name}
         label={__('Hostname')}
         value={opts?.hostname?.value}
+        disabled
         onChange={handleChange}
       />
       <InputField

data/webpack/components/ProxmoxContainer/ProxmoxContainerStorage.js

@@ -124,7 +124,7 @@ const ProxmoxContainerStorage = ({ storage, storages, nodeId, paramScope }) => {
         />
         <InputField
           name={rootfs?.size?.name}
-          label={__('Size')}
+          label={__('Size (GB)')}
           type="number"
           value={rootfs?.size?.value}
           onChange={handleChange}

data/webpack/components/ProxmoxContainer/components/NetworkInterface.js

@@ -13,7 +13,8 @@ const NetworkInterface = ({
   existingInterfaces,
 }) => {
   const [network, setNetwork] = useState(data);
-  const [error, setError] = useState('');
+  const [idError, setIdError] = useState('');
+  const [nameError, setNameError] = useState('');
   useEffect(() => {
     const currentNetData = JSON.stringify(network);
     const parentNetData = JSON.stringify(data);
@@ -48,23 +49,23 @@ const NetworkInterface = ({
             net.data.id.value !== network.id.value
         )
       ) {
-        setError(__('Error: Duplicate ID found.'));
+        setIdError(__('Error: Duplicate ID found.'));
         return;
       }
-      setError('');
+      setIdError('');
     }
     if (updatedKey === 'name') {
-      const idValue = value;
+      const nameValue = value;
       if (
         Object.values(existingInterfaces).some(
           net =>
-            net.data.id.value === idValue &&
-            net.data.id.value !== network.id.value
+            net.data.name.value === nameValue &&
+            net.data.name.value !== network.name.value
         )
       ) {
-        setError(__('Error: Duplicate Name found.'));
+        setNameError(__('Error: Duplicate Name found.'));
       } else {
-        setError('');
+        setNameError('');
       }
     }
   };
@@ -83,7 +84,7 @@ const NetworkInterface = ({
         type="text"
         value={network?.id?.value}
         onChange={handleChange}
-        error={error}
+        error={idError}
       />
       <InputField
         name={network?.name?.name}
@@ -92,7 +93,7 @@ const NetworkInterface = ({
         type="text"
         value={network?.name?.value}
         onChange={handleChange}
-        error={error}
+        error={nameError}
       />
       <InputField
         name={network?.bridge?.name}
@@ -107,7 +108,7 @@ const NetworkInterface = ({
         label={__('DHCP IPv4')}
         type="checkbox"
         value={network?.dhcp?.value}
-        checked={network?.dhcp?.value === '1'}
+        checked={String(network?.dhcp?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
@@ -130,7 +131,7 @@ const NetworkInterface = ({
         label={__('DHCP IPv6')}
         type="checkbox"
         value={network?.dhcp6?.value}
-        checked={network?.dhcp6?.value === '1'}
+        checked={String(network?.dhcp6?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
@@ -167,7 +168,7 @@ const NetworkInterface = ({
         label={__('Firewall')}
         type="checkbox"
         value={network?.firewall?.value}
-        checked={network?.firewall?.value === '1'}
+        checked={String(network?.firewall?.value) === '1'}
         onChange={handleChange}
       />
     </div>

data/webpack/components/ProxmoxServer/ProxmoxServerHardware.js

@@ -6,19 +6,19 @@ import InputField from '../common/FormInputs';
 import ProxmoxComputeSelectors from '../ProxmoxComputeSelectors';
 import CPUFlagsModal from './components/CPUFlagsModal';
 
-const cpuFlagNames = [
-  'md_clear',
-  'pcid',
-  'spec_ctrl',
-  'ssbd',
-  'ibpb',
-  'virt_ssbd',
-  'amd_ssbd',
-  'amd_no_ssb',
-  'pdpe1gb',
-  'hv_tlbflush',
-  'hv_evmcs',
-  'aes',
+const cpuFlagsHash = [
+  { key: 'md_clear', label: 'md-clear' },
+  { key: 'pcid', label: 'pcid' },
+  { key: 'spectre', label: 'spec-ctrl' },
+  { key: 'ssbd', label: 'ssbd' },
+  { key: 'ibpb', label: 'ibpb' },
+  { key: 'virt_ssbd', label: 'virt-ssbd' },
+  { key: 'amd_ssbd', label: 'amd-ssbd' },
+  { key: 'amd_no_ssb', label: 'amd-no-ssb' },
+  { key: 'pdpe1gb', label: 'pdpe1gb' },
+  { key: 'hv_tlbflush', label: 'hv-tlbflush' },
+  { key: 'hv_evmcs', label: 'hv-evmcs' },
+  { key: 'aes', label: 'aes' },
 ];
 
 const cpuFlagDescriptions = {
@@ -28,7 +28,7 @@ const cpuFlagDescriptions = {
   pcid: __(
     'Meltdown fix cost reduction on Westmere, Sandy-, and IvyBridge Intel CPUs'
   ),
-  spec_ctrl: __('Allows improved Spectre mitigation with Intel CPUs'),
+  spectre: __('Allows improved Spectre mitigation with Intel CPUs'),
   ssbd: __('Protection for "Speculative Store Bypass" for Intel models'),
   ibpb: __('Allows improved Spectre mitigation with AMD CPUs'),
   virt_ssbd: __(
@@ -47,20 +47,20 @@ const cpuFlagDescriptions = {
   hv_evmcs: __(
     'Improve performance for nested virtualization. Only supported on Intel CPUs.'
   ),
-  aes: __('Activate AES instruction set for HW instruction'),
+  aes: __('Activate AES instruction set for HW accelaration.'),
 };
 
 const filterAndAddDescriptions = hardware =>
-  Object.keys(hardware)
-    .filter(key => cpuFlagNames.includes(key))
-    .reduce((acc, key) => {
+  cpuFlagsHash.reduce((acc, { key, label }) => {
+    if (key in hardware) {
       acc[key] = {
         ...hardware[key],
         description: cpuFlagDescriptions[key] || '',
-        label: key,
+        label,
       };
-      return acc;
-    }, {});
+    }
+    return acc;
+  }, {});
 
 const ProxmoxServerHardware = ({ hardware }) => {
   const [hw, setHw] = useState(hardware);
@@ -141,7 +141,7 @@ const ProxmoxServerHardware = ({ hardware }) => {
           label={__('Enable NUMA')}
           type="checkbox"
           value={hw?.numa?.value}
-          checked={hw?.numa?.value === '1'}
+          checked={String(hw?.numa?.value) === '1'}
           onChange={handleChange}
         />
         <div style={{ marginLeft: '5%', display: 'inline-block' }}>

data/webpack/components/ProxmoxServer/ProxmoxServerNetwork.js

@@ -63,7 +63,7 @@ const ProxmoxServerNetwork = ({ network, bridges, paramScope }) => {
           name: `${paramScope}[interfaces_attributes][${nextId}][firewall]`,
           value: '0',
         },
-        link_down: {
+        linkDown: {
           name: `${paramScope}[interfaces_attributes][${nextId}][link_down]`,
           value: '0',
         },

data/webpack/components/ProxmoxServer/ProxmoxServerOptions.js

@@ -38,7 +38,7 @@ const ProxmoxServerOptions = ({ options }) => {
         label={__('Start at boot')}
         type="checkbox"
         value={opts?.onboot?.value}
-        checked={opts?.onboot?.value === '1'}
+        checked={String(opts?.onboot?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
@@ -46,7 +46,7 @@ const ProxmoxServerOptions = ({ options }) => {
         label={__('Qemu Agent')}
         type="checkbox"
         value={opts?.agent?.value}
-        checked={opts?.agent?.value === '1'}
+        checked={String(opts?.agent?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
@@ -55,7 +55,7 @@ const ProxmoxServerOptions = ({ options }) => {
         info={__('Enable/disable KVM hardware virtualization')}
         type="checkbox"
         value={opts?.kvm?.value}
-        checked={opts?.kvm?.value === '1'}
+        checked={String(opts?.kvm?.value) === '1'}
         onChange={handleChange}
       />
       <InputField

data/webpack/components/ProxmoxServer/components/HardDisk.js

@@ -74,15 +74,15 @@ const HardDisk = ({
         onChange={handleChange}
       />
       <input
-        name={hdd?.device?.name}
+        name={hdd?.id?.name}
         type="hidden"
-        value={hdd?.device?.value}
+        value={hdd?.id?.value}
         onChange={handleChange}
       />
       <input
-        name={hdd?.id?.name}
+        name={hdd?.volid?.name}
         type="hidden"
-        value={hdd?.id?.value}
+        value={hdd?.volid?.value}
         onChange={handleChange}
       />
       <InputField
@@ -102,6 +102,14 @@ const HardDisk = ({
         onChange={handleChange}
         error={error}
       />
+      <InputField
+        label={__('Device')}
+        name={hdd?.device?.name}
+        value={hdd?.device?.value}
+        onChange={handleChange}
+        disabled
+        tooltip={__('Device value is set automatically.')}
+      />
       <InputField
         name={hdd?.cache?.name}
         label={__('Cache')}
@@ -112,7 +120,7 @@ const HardDisk = ({
       />
       <InputField
         name={hdd?.size?.name}
-        label={__('Size')}
+        label={__('Size (GB)')}
         type="number"
         value={hdd?.size?.value}
         onChange={handleChange}

data/webpack/components/ProxmoxServer/components/NetworkInterface.js

@@ -115,7 +115,7 @@ const NetworkInterface = ({
         label={__('Firewall')}
         type="checkbox"
         value={network?.firewall?.value}
-        checked={network?.firewall?.value === '1'}
+        checked={String(network?.firewall?.value) === '1'}
         onChange={handleChange}
       />
       <InputField
@@ -123,7 +123,7 @@ const NetworkInterface = ({
         label={__('Disconnect')}
         type="checkbox"
         value={network?.linkDown?.value}
-        checked={network?.linkDown?.value === '1'}
+        checked={String(network?.linkDown?.value) === '1'}
         onChange={handleChange}
       />
     </div>

data/webpack/components/ProxmoxVmType.js

@@ -33,27 +33,30 @@ const ProxmoxVmType = ({
   registerComp,
   untemplatable,
 }) => {
-  const nodesMap = nodes
-    ? nodes.map(node => ({ value: node.node, label: node.node }))
-    : [];
-  const imagesMap = images
-    ? [
-        { value: '', label: '' },
-        ...images.map(image => ({
-          value: image.uuid,
-          label: image.name,
-        })),
-      ]
-    : [];
-  const poolsMap = pools
-    ? [
-        { value: '', label: '' },
-        ...pools.map(pool => ({
-          value: pool.poolid,
-          label: pool.poolid,
-        })),
-      ]
-    : [];
+  const nodesMap =
+    nodes.length > 0
+      ? nodes.map(node => ({ value: node.node, label: node.node }))
+      : [];
+  const imagesMap =
+    images.length > 0
+      ? [
+          { value: '', label: '' },
+          ...images.map(image => ({
+            value: image.uuid,
+            label: image.name,
+          })),
+        ]
+      : [];
+  const poolsMap =
+    pools.length > 0
+      ? [
+          { value: '', label: '' },
+          ...pools.map(pool => ({
+            value: pool.poolid,
+            label: pool.poolid,
+          })),
+        ]
+      : [];
   const [activeTabKey, setActiveTabKey] = useState(0);
   const handleTabClick = (event, tabIndex) => {
     setActiveTabKey(tabIndex);

data/webpack/components/common/FormInputs.js

@@ -1,5 +1,6 @@
 import React, { Fragment } from 'react';
 import { FieldLevelHelp } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import CommonForm from 'foremanReact/components/common/forms/CommonForm';
 
@@ -15,6 +16,7 @@ const InputField = ({
   options,
   checked,
   error,
+  tooltip,
 }) => {
   const renderOptions = opts =>
     opts.map(option => <option value={option.value}>{option.label}</option>);
@@ -39,7 +41,7 @@ const InputField = ({
         <select
           disabled={disabled}
           name={name}
-          className="form-control"
+          className="without_select2 form-control"
           value={value}
           onChange={onChange}
         >
@@ -88,7 +90,11 @@ const InputField = ({
         )
       }
     >
-      {renderComponent}
+      {tooltip ? (
+        <Tooltip content={tooltip}>{renderComponent}</Tooltip>
+      ) : (
+        renderComponent
+      )}
       {error && (
         <div style={{ color: 'red', marginTop: '0.5rem' }}>{error}</div>
       )}
@@ -125,6 +131,7 @@ InputField.propTypes = {
     })
   ),
   error: PropTypes.string,
+  tooltip: PropTypes.string,
 };
 
 InputField.defaultProps = {
@@ -138,6 +145,7 @@ InputField.defaultProps = {
   checked: false,
   options: [],
   error: '',
+  tooltip: '',
 };
 
 export default InputField;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -204,8 +204,10 @@ files:
 - app/views/compute_resources_vms/show/_proxmox.html.erb
 - app/views/dashboard/_foreman_fog_proxmox_widget.erb
 - app/views/images/form/_proxmox.html.erb
+- app/views/templates/provisioning/user_data/proxmox_user_data.erb
 - config/routes.rb
 - db/migrate/20210312105013_update_proxmox_uuid_host.rb
+- db/seeds.d/71_provisioning_templates.rb
 - lib/foreman_fog_proxmox.rb
 - lib/foreman_fog_proxmox/engine.rb
 - lib/foreman_fog_proxmox/hash_collection.rb
@@ -291,29 +293,29 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
+- test/test_plugin_helper.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_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_vm_commands_server_create_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_version_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_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_images_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_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/semver_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_cdrom_test.rb
-- test/test_plugin_helper.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
+- 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_node_mock_factory.rb
 - test/factories/proxmox_factory.rb
-- test/functional/compute_resources_controller_test.rb