foreman_fog_proxmox 0.16.1 → 0.17.0

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateCdromTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerUpdateCdromTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do
@@ -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/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateCloudinitTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerUpdateCloudinitTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateHardDiskTest < ActiveSupport::TestCase # rubocop:disable Metrics/ClassLength
+  class ProxmoxVMCommandsServerUpdateHardDiskTest < ActiveSupport::TestCase # rubocop:disable Metrics/ClassLength
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     # rubocop:disable Metrics/BlockLength
     describe 'save_vm' do

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb

@@ -24,11 +24,11 @@ require 'factories/foreman_fog_proxmox/proxmox_server_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerUpdateTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerUpdateTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'save_vm' do
       before do

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb

@@ -25,12 +25,12 @@ require 'factories/foreman_fog_proxmox/proxmox_container_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmCommandsServerTest < ActiveSupport::TestCase
+  class ProxmoxVMCommandsServerTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'destroy_vm' do
       it 'handles situation when vm is not present' do

data/test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb

@@ -25,12 +25,12 @@ require 'factories/foreman_fog_proxmox/proxmox_container_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmNewTest < ActiveSupport::TestCase
+  class ProxmoxVMNewTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'new_vm' do
       before do

data/test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb

@@ -25,12 +25,12 @@ require 'factories/foreman_fog_proxmox/proxmox_container_mock_factory'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ForemanFogProxmox
-  class ProxmoxVmQueriesTest < ActiveSupport::TestCase
+  class ProxmoxVMQueriesTest < ActiveSupport::TestCase
     include ComputeResourceTestHelpers
     include ProxmoxNodeMockFactory
     include ProxmoxServerMockFactory
     include ProxmoxContainerMockFactory
-    include ProxmoxVmHelper
+    include ProxmoxVMHelper
 
     describe 'find_vm_by_uuid' do
       it 'returns nil when the uuid does not match' do

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);