foreman_fog_proxmox 0.13.4 → 0.14.1

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -27,8 +27,14 @@ module ForemanFogProxmox
     end
 
     def set_nic_identifier(nic, index)
-      nic.identifier = format('net%<index>s', index: index) if nic.identifier.empty?
-      raise ::Foreman::Exception, _(format('Invalid identifier interface[%<index>s]. Must be net[n] with n integer >= 0', index: index)) unless Fog::Proxmox::NicHelper.nic?(nic.identifier)
+      nic.compute_attributes[:id] = format('net%<index>s', index: index) if nic.compute_attributes[:id].empty?
+      unless Fog::Proxmox::NicHelper.nic?(nic.compute_attributes[:id])
+        raise ::Foreman::Exception,
+          _(format('Invalid proxmox NIC id on interface[%<index>s]. Must be net[n] with n integer >= 0',
+            index: index))
+      end
+
+      nic.identifier = nic.compute_attributes['id'] if nic.identifier.empty?
     end
 
     def vm_type(host)
@@ -47,7 +53,11 @@ module ForemanFogProxmox
 
     def set_container_interface_name(_host, nic, index)
       nic.compute_attributes['name'] = format('eth%<index>s', index: index) if nic.compute_attributes['name'].empty?
-      raise ::Foreman::Exception, _(format('Invalid name interface[%<index>s]. Must be eth[n] with n integer >= 0', index: index)) unless container_nic_name_valid?(nic)
+      unless container_nic_name_valid?(nic)
+        raise ::Foreman::Exception,
+          _(format('Invalid name interface[%<index>s]. Must be eth[n] with n integer >= 0',
+            index: index))
+      end
     end
 
     def cidr_prefix(nic_compute_attributes, v6 = false)
@@ -64,7 +74,9 @@ module ForemanFogProxmox
       ipv = "IPv#{v6 ? '6' : '4'}"
       max = v6 ? 128 : 32
       checked = valid || ForemanFogProxmox::Value.empty?(ip)
-      message = format('Invalid Interface Proxmox CIDR %<ip>s. If %<ip>s is not empty, Proxmox CIDR prefix must be an integer between 0 and %<max>i.', ip: ipv, max: max)
+      message = format(
+        'Invalid Interface Proxmox CIDR %<ip>s. If %<ip>s is not empty, Proxmox CIDR prefix must be an integer between 0 and %<max>i.', ip: ipv, max: max
+      )
       raise ::Foreman::Exception, _(message) unless checked
     end
 
@@ -87,7 +99,10 @@ module ForemanFogProxmox
           ip = 'dhcp'
         elsif !ForemanFogProxmox::Value.empty?(cidr_prefix(nic_compute_attributes, v6))
           check_cidr(nic_compute_attributes, v6, ip)
-          ip = Fog::Proxmox::IpHelper.send(to_cidr_method(v6), nic.send(ip_s(v6).to_sym), cidr_prefix(nic_compute_attributes, v6)) if ip
+          if ip
+            ip = Fog::Proxmox::IpHelper.send(to_cidr_method(v6), nic.send(ip_s(v6).to_sym),
+              cidr_prefix(nic_compute_attributes, v6))
+          end
         end
       end
       nic_compute_attributes[ip_s(v6).to_sym] = ip
@@ -112,17 +127,25 @@ module ForemanFogProxmox
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
         set_nic_identifier(nic, index)
         set_container_interface_name(host, nic, index) if container?(host)
-        nic_compute_attributes = nic.compute_attributes.merge(id: nic.identifier)
-        ForemanFogProxmox::HashCollection.remove_empty_values(nic_compute_attributes)
+        ForemanFogProxmox::HashCollection.remove_empty_values(nic.compute_attributes)
         mac = nic.mac
         mac ||= nic.attributes['mac']
-        set_mac(nic_compute_attributes, mac, vm_type(host)) if mac.present?
-        interface_compute_attributes = host.compute_attributes['interfaces_attributes'] ? host.compute_attributes['interfaces_attributes'].select { |_k, v| v['id'] == nic.identifier } : {}
-        nic_compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
-        set_ip(host, nic, nic_compute_attributes)
-        set_ip(host, nic, nic_compute_attributes, true)
-        ForemanFogProxmox::HashCollection.remove_keys(nic_compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
-        hash.merge(index.to_s => nic_compute_attributes)
+        set_mac(nic.compute_attributes, mac, vm_type(host)) if mac.present?
+        interface_compute_attributes = if host.compute_attributes['interfaces_attributes']
+                                         host.compute_attributes['interfaces_attributes'].select do |_k, v|
+                                           v['id'] == nic.compute_attributes[:id]
+                                         end
+                                       else
+                                         {}
+                                       end
+        unless interface_compute_attributes.empty?
+          nic.compute_attributes.store(:_delete,
+            interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete'])
+        end
+        set_ip(host, nic, nic.compute_attributes)
+        set_ip(host, nic, nic.compute_attributes, true)
+        ForemanFogProxmox::HashCollection.remove_keys(nic.compute_attributes, ['dhcp', 'dhcp6', 'cidr', 'cidr6'])
+        hash.merge(index.to_s => nic.compute_attributes)
       end
     end
   end

data/app/models/foreman_fog_proxmox/proxmox_operating_systems.rb

@@ -39,7 +39,12 @@ module ForemanFogProxmox
     end
 
     def os_linux_types_mapping(host)
-      ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'Coreos', 'Rancheros', 'Gentoo'].include?(host.operatingsystem.type) ? available_linux_operating_systems : []
+      if ['Debian', 'Redhat', 'Suse', 'Altlinux', 'Archlinux', 'Coreos', 'Rancheros',
+          'Gentoo'].include?(host.operatingsystem.type)
+        available_linux_operating_systems
+      else
+        []
+      end
     end
 
     def os_windows_types_mapping(host)

data/app/models/foreman_fog_proxmox/proxmox_pools.rb

@@ -25,21 +25,21 @@ module ForemanFogProxmox
     end
 
     def pool_owner(vm)
-      logger.debug(format(_('pool_owner(%<vmid>s)'), vmid: vm&.vmid))
+      logger.debug("pool_owner(#{vm&.vmid})")
       pools_owners = pools.select { |pool| pool.has_server?(vm&.vmid) }
       pool = pools_owners.first
-      logger.debug(format(_('found vm: %<vmid>s member of pool: %<poolid>s'), vmid: vm&.vmid, poolid: pool&.poolid))
+      logger.debug("found vm: #{vm&.vmid} member of pool: #{pool&.poolid}")
       vm&.config&.pool = pool&.poolid
     end
 
     def add_vm_to_pool(poolid, vmid)
-      logger.debug(format(_('add_vm_to_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      logger.debug("add_vm_to_pool(#{poolid}, #{vmid})")
       pool = identity_client.pools.get poolid
       pool&.add_server vmid
     end
 
     def remove_vm_from_pool(poolid, vmid)
-      logger.debug(format(_('remove_vm_from_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      logger.debug("remove_vm_from_pool(#{poolid}, #{vmid})")
       pool = identity_client.pools.get poolid
       pool&.remove_server vmid
     end

data/app/models/foreman_fog_proxmox/proxmox_version.rb

@@ -22,8 +22,12 @@ require 'foreman_fog_proxmox/semver'
 module ForemanFogProxmox
   module ProxmoxVersion
     def version_suitable?
-      logger.debug(format(_('Proxmox compute resource version is %<version>s'), version: version))
-      raise ::Foreman::Exception, format(_('Proxmox version %<version>s is not semver suitable'), version: version) unless ForemanFogProxmox::Semver.semver?(version)
+      logger.debug("Proxmox compute resource version is #{version}")
+      unless ForemanFogProxmox::Semver.semver?(version)
+        raise ::Foreman::Exception,
+          format(_('Proxmox version %<version>s is not semver suitable'),
+            version: version)
+      end
 
       ForemanFogProxmox::Semver.to_semver(version) >= ForemanFogProxmox::Semver.to_semver('5.3.0')
     end
@@ -34,7 +38,7 @@ module ForemanFogProxmox
     rescue ::Foreman::Exception => e
       return 'Unkown' if e.message == 'User token expired'
     rescue StandardError => e
-      logger.warn(format(_('failed to get identity client version: %<e>s'), e: e))
+      logger.warn("failed to get identity client version: #{e}")
       raise e
     end
   end

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -42,14 +42,13 @@ module ForemanFogProxmox
       if image_id
         clone_from_image(image_id, args, vmid)
       else
-        convert_sizes(args)
         remove_volume_keys(args)
-        logger.warn(format(_('create vm: args=%<args>s'), args: 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
     rescue StandardError => e
-      logger.warn(format(_('failed to create vm: %<e>s'), e: e))
+      logger.warn("failed to create vm: #{e}")
       destroy_vm client.identity + '_' + vm.id if vm
       raise e
     end
@@ -74,7 +73,8 @@ module ForemanFogProxmox
     end
 
     def compute_config_attributes(parsed_attr)
-      excluded_keys = [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes, :pool]
+      excluded_keys = [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes,
+                       :pool]
       config_attributes = parsed_attr.reject { |key, _value| excluded_keys.include? key.to_sym }
       ForemanFogProxmox::HashCollection.remove_empty_values(config_attributes)
       config_attributes = config_attributes.reject { |key, _value| Fog::Proxmox::DiskHelper.disk?(key) }
@@ -90,11 +90,13 @@ module ForemanFogProxmox
       elsif vm.node_id != node_id
         vm.migrate(node_id)
       else
-        convert_memory_sizes(new_attributes)
-        parsed_attr = parse_typed_vm(ForemanFogProxmox::HashCollection.new_hash_reject_keys(new_attributes, ['volumes_attributes']).merge(type: vm.type), vm.type)
+        parsed_attr = parse_typed_vm(
+          ForemanFogProxmox::HashCollection.new_hash_reject_keys(new_attributes,
+            ['volumes_attributes']).merge(type: vm.type), vm.type
+        )
         config_attributes = compute_config_attributes(parsed_attr)
         volumes_attributes = new_attributes['volumes_attributes']
-        logger.debug(format(_('save_vm(%<vmid>s) volumes_attributes=%<volumes_attributes>s'), vmid: uuid, volumes_attributes: volumes_attributes))
+        logger.debug("save_vm(#{uuid}) volumes_attributes=#{volumes_attributes}")
         volumes_attributes&.each_value { |volume_attributes| save_volume(vm, volume_attributes) }
         vm.update(config_attributes[:config_attributes])
         poolid = new_attributes['pool'] if new_attributes.key?('pool')

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -36,7 +36,7 @@ module ForemanFogProxmox
 
     def hard_disk_typed_defaults(vm_type)
       options = {}
-      volume_attributes_h = { storage: storages.first.identity.to_s, size: (8 * GIGA) }
+      volume_attributes_h = { storage: storages.first.identity.to_s, size: '8' }
       case vm_type
       when 'qemu'
         controller = 'virtio'
@@ -74,8 +74,14 @@ module ForemanFogProxmox
 
     def interface_typed_defaults(type)
       interface_attributes_h = { id: 'net0', compute_attributes: {} }
-      interface_attributes_h[:compute_attributes] = { model: 'virtio', bridge: bridges.first.identity.to_s } if type == 'qemu'
-      interface_attributes_h[:compute_attributes] = { name: 'eth0', bridge: bridges.first.identity.to_s, dhcp: 1, dhcp6: 1 } if type == 'lxc'
+      if type == 'qemu'
+        interface_attributes_h[:compute_attributes] =
+          { model: 'virtio', bridge: bridges.first.identity.to_s }
+      end
+      if type == 'lxc'
+        interface_attributes_h[:compute_attributes] =
+          { name: 'eth0', bridge: bridges.first.identity.to_s, dhcp: 1, dhcp6: 1 }
+      end
       interface_attributes_h
     end
 
@@ -106,7 +112,7 @@ module ForemanFogProxmox
       interfaces_attributes = []
       interfaces_attributes.push(interface_typed_defaults(type))
       new_attr = new_attr.merge(interfaces_attributes: interfaces_attributes.map.with_index.to_h.invert)
-      logger.debug(format(_('add_default_typed_interface(%<type>s) to new_attr=%<new_attr>s'), type: type, new_attr: new_attr))
+      logger.debug("add_default_typed_interface(#{type}) to new_attr=#{new_attr}")
       new_attr
     end
 
@@ -115,7 +121,7 @@ module ForemanFogProxmox
       volumes_attributes.push(hard_disk_typed_defaults('qemu'))
       volumes_attributes.push(hard_disk_typed_defaults('lxc'))
       new_attr = new_attr.merge(volumes_attributes: volumes_attributes.map.with_index.to_h.invert)
-      logger.debug(format(_('add_default_typed_volume(%<type>s) to new_attr=%<new_attr>s'), type: type, new_attr: new_attr))
+      logger.debug("add_default_typed_volume(#{type}) to new_attr=#{new_attr}")
       new_attr
     end
 
@@ -127,29 +133,28 @@ module ForemanFogProxmox
       defaults = vm_instance_defaults
       defaults = defaults.merge(config_attributes: config_attributes(type))
       defaults = add_default_typed_volume(defaults)
-      defaults = add_default_typed_interface(type, defaults)
-      defaults
+      add_default_typed_interface(type, defaults)
     end
 
     def config_attributes(type = 'qemu')
       case type
       when 'qemu'
         config_attributes = {
-          cores: 1,
-          sockets: 1,
-          kvm: 0,
+          cores: '1',
+          sockets: '1',
+          kvm: '0',
           vga: 'std',
-          memory: 512 * MEGA,
+          memory: '1024',
           ostype: 'l26',
           cpu: 'cputype=kvm64',
           scsihw: 'virtio-scsi-pci',
-          templated: 0
+          templated: '0',
         }
         config_attributes = config_attributes
       when 'lxc'
         config_attributes = {
-          memory: 512 * MEGA,
-          templated: 0
+          memory: '1024',
+          templated: '0',
         }
       end
       config_attributes
@@ -159,14 +164,21 @@ module ForemanFogProxmox
       new_attr = ActiveSupport::HashWithIndifferentAccess.new(new_attr)
       type = new_attr['type']
       type ||= 'qemu'
-      vm = new_typed_vm(new_attr, type)
-      vm
+      new_typed_vm(new_attr, type)
     end
 
     def convert_config_attributes(new_attr)
       config_attributes = new_attr[:config_attributes]
-      config_attributes[:volumes_attributes] = Hash[config_attributes[:disks].each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }] if config_attributes.key?(:disks)
-      config_attributes[:interfaces_attributes] = Hash[config_attributes[:interfaces].each_with_index.map { |interface, idx| [idx.to_s, interface_compute_attributes(interface.attributes)] }] if config_attributes.key?(:interfaces)
+      if config_attributes.key?(:disks)
+        config_attributes[:volumes_attributes] = Hash[config_attributes[:disks].each_with_index.map do |disk, idx|
+                                                        [idx.to_s, disk.attributes]
+                                                      end ]
+      end
+      if config_attributes.key?(:interfaces)
+        config_attributes[:interfaces_attributes] = Hash[config_attributes[:interfaces].each_with_index.map do |interface, idx|
+                                                           [idx.to_s, interface_compute_attributes(interface.attributes)]
+                                                         end ]
+      end
       config_attributes.delete_if { |key, _value| ['disks', 'interfaces'].include?(key) }
     end
 
@@ -177,14 +189,15 @@ module ForemanFogProxmox
       new_attr_type = new_attr['type']
       new_attr_type ||= new_attr['config_attributes']['type'] if new_attr.key?('config_attributes')
       new_attr_type ||= type
-      logger.debug(format(_('new_typed_vm(%<type>s): new_attr_type=%<new_attr_type>s'), type: type, new_attr_type: new_attr_type))
-      logger.debug(format(_('new_typed_vm(%<type>s): new_attr=%<new_attr>s'), type: type, new_attr: new_attr))
+      logger.debug("new_typed_vm(#{type}): new_attr_type=#{new_attr_type}")
+      logger.debug("new_typed_vm(#{type}): new_attr=#{new_attr}'")
       options = !new_attr.key?('vmid') || ForemanFogProxmox::Value.empty?(new_attr['vmid']) ? vm_typed_instance_defaults(type).merge(new_attr).merge(type: type) : new_attr
-      logger.debug(format(_('new_typed_vm(%<type>s): options=%<options>s'), type: type, options: options))
+      logger.debug("new_typed_vm(#{type}): options=#{options}")
       vm_h = parse_typed_vm(options, type).deep_symbolize_keys
-      logger.debug(format(_('new_typed_vm(%<type>s): vm_h=%<vm_h>s'), type: type, vm_h: vm_h))
-      vm = node.send(vm_collection(type)).new(vm_h)
-      vm
+      logger.debug("new_typed_vm(#{type}): vm_h=#{vm_h}")
+      vm_h = vm_h.merge(vm_typed_instance_defaults(type)) if vm_h.empty?
+      logger.debug(format(_('new_typed_vm(%<type>s) with vm_typed_instance_defaults: vm_h=%<vm_h>s'), type: type, vm_h: vm_h))
+      node.send(vm_collection(type)).new(vm_h)
     end
   end
 end

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -31,7 +31,7 @@ module ForemanFogProxmox
       node = client.nodes.get node_id
       node ||= default_node
       storages = node.storages.list_by_content_type type
-      logger.debug(format(_('storages(): node_id %<node_id>s type %<type>s'), node_id: node_id, type: type))
+      logger.debug("storages(): node_id #{node_id} type #{type}")
       storages.sort_by(&:storage)
     end
 
@@ -61,10 +61,9 @@ module ForemanFogProxmox
       nodes.each do |node|
         vm = find_vm_in_servers_by_vmid(node.servers, vmid)
         vm ||= find_vm_in_servers_by_vmid(node.containers, vmid)
-        unless vm.nil?
-          logger.debug("found vm #{vmid} on node #{node.node}")
-          break
-        end
+        next if vm.nil?
+        logger.debug("found vm #{vmid} on node #{node.node}")
+        break
       end
       vm
     end

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -25,7 +25,7 @@ module ForemanFogProxmox
     include ProxmoxVmHelper
 
     def delete_volume(vm, id, volume_attributes)
-      logger.info(format(_('vm %<vmid>s delete volume %<volume_id>s'), vmid: vm.identity, volume_id: id))
+      logger.info("vm #{vm.identity} delete volume #{id}")
       vm.detach(id)
       return unless volume_type?(volume_attributes, 'hard_disk')
 
@@ -36,7 +36,7 @@ module ForemanFogProxmox
     def volume_options(vm, id, volume_attributes)
       options = {}
       options.store(:mp, volume_attributes['mp']) if vm.container? && id != 'rootfs'
-      options.store(:cache, volume_attributes['cache']) unless vm.container?
+      options.store(:cache, volume_attributes['cache']) unless vm.container? || volume_attributes['cache'].empty?
       options
     end
 
@@ -59,19 +59,19 @@ module ForemanFogProxmox
     end
 
     def extend_volume(vm, id, diff_size)
-      extension = '+' + (diff_size / GIGA).to_s + 'G'
-      logger.info(format(_('vm %<vmid>s extend volume %<volume_id>s to %<extension>s'), vmid: vm.identity, volume_id: id, extension: extension))
+      extension = "+#{diff_size}G"
+      logger.info("vm #{vm.identity} extend volume #{id} to #{extension}")
       vm.extend(id, extension)
     end
 
     def move_volume(id, vm, new_storage)
-      logger.info(format(_('vm %<vmid>s move volume %<volume_id>s into %<new_storage>s'), vmid: vm.identity, volume_id: id, new_storage: new_storage))
+      logger.info("vm #{vm.identity} move volume #{id} into #{new_storage}")
       vm.move(id, new_storage)
     end
 
     def update_options(disk, vm, volume_attributes)
       options = volume_options(vm, disk.id, volume_attributes) if volume_type?(volume_attributes, 'hard_disk')
-      logger.info(format(_('vm %<vmid>s update volume %<volume_id>s to %<options>s'), vmid: vm.identity, volume_id: disk.id, options: options))
+      logger.info("vm #{vm.identity} update volume #{disk.id} to #{options}")
       new_disk = { id: disk.id }
       new_disk[:volid] = disk.volid
       vm.attach(new_disk, options)
@@ -82,7 +82,12 @@ module ForemanFogProxmox
       if volume_type?(volume_attributes, 'cdrom')
         update_cdrom(vm, disk, volume_attributes)
       elsif volume_type?(volume_attributes, 'hard_disk')
-        diff_size = volume_attributes['size'].to_i - disk.size if volume_attributes['size'] && disk.size
+        diff_size = volume_attributes['size'].to_i - disk.size.to_i if volume_attributes['size'] && disk.size
+        unless diff_size >= 0
+          raise ::Foreman::Exception,
+            format(_('Unable to shrink %<id>s size. Proxmox allows only increasing size.'), id: id)
+        end
+        diff_size = volume_attributes['size'].to_i - disk.size.to_i if volume_attributes['size'] && disk.size
         raise ::Foreman::Exception, format(_('Unable to shrink %<id>s size. Proxmox allows only increasing size.'), id: id) unless diff_size >= 0
 
         new_storage = volume_attributes['storage']
@@ -98,7 +103,13 @@ module ForemanFogProxmox
     end
 
     def volume_exists?(vm, volume_attributes)
-      vm.attributes.key?(volume_attributes['id'])
+      disk = vm.config.disks.get(volume_attributes['id'])
+      exists = false
+      return exists unless disk
+
+      exists = !volume_attributes['volid'].empty? if disk.hard_disk? || disk.cloud_init?
+      exists = !volume_attributes['cdrom'].empty? if disk.cdrom?
+      exists
     end
 
     def volume_to_delete?(volume_attributes)
@@ -121,20 +132,20 @@ module ForemanFogProxmox
       if volume_type?(volume_attributes, 'hard_disk')
         options = volume_options(vm, id, volume_attributes)
         disk_attributes[:storage] = volume_attributes['storage']
-        disk_attributes[:size] = (volume_attributes['size'].to_i / GIGA).to_s
+        disk_attributes[:size] = volume_attributes['size']
       elsif volume_type?(volume_attributes, 'cdrom')
         disk_attributes[:volid] = volume_attributes[:iso]
       elsif volume_type?(volume_attributes, 'cloud_init')
         disk_attributes[:storage] = volume_attributes['storage']
         disk_attributes[:volid] = "#{volume_attributes['storage']}:cloudinit"
       end
-      logger.info(format(_('vm %<vmid>s add volume %<volume_id>s'), vmid: vm.identity, volume_id: id))
-      logger.debug(format(_('add_volume(%<vmid>s) disk_attributes=%<disk_attributes>s'), vmid: vm.identity, disk_attributes: disk_attributes))
+      logger.info("vm #{vm.identity} add volume #{id}")
+      logger.debug("add_volume(#{vm.identity}) disk_attributes=#{disk_attributes}")
       vm.attach(disk_attributes, options)
     end
 
     def save_volume(vm, volume_attributes)
-      logger.debug(format(_('save_volume(%<vmid>s) volume_attributes=%<volume_attributes>s'), vmid: vm.identity, volume_attributes: volume_attributes))
+      logger.debug("save_volume(#{vm.identity}) volume_attributes=#{volume_attributes}")
       id = extract_id(vm, volume_attributes)
       if volume_exists?(vm, volume_attributes)
         if volume_to_delete?(volume_attributes)

data/app/models/foreman_fog_proxmox/vms.rb

@@ -21,8 +21,8 @@ module ForemanFogProxmox
   class Vms
     attr_reader :items
 
-    def each
-      @items.each { |item| yield item }
+    def each(&block)
+      @items.each(&block)
     end
 
     # TODO: Pagination with filters

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

@@ -20,6 +20,6 @@ Deface::Override.new(
   :name => 'add_from_profile_to_compute_detail',
   :replace => "erb[loud]:contains('provider_partial')",
   :partial => 'compute_resources_vms/form/proxmox/add_from_profile_to_hosts_compute_detail_form',
-  :original => '448e3b265e4dc1789f0efbbc6076e32216ac3a24',
+  :original => '8902a49136f750d781dcaa44e7ffa8a29c1a94df',
   :namespaced => true
 )

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

@@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-        :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true, :from_profile => from_profile }.merge(args_for_compute_resource_partial(@host)) %>
+        :locals => { :f => f, :host => nil, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :from_profile => from_profile } %>
 <% else %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true }.merge(args_for_compute_resource_partial(@host)) %>
+            :locals => { :f => f, :host => nil, :compute_resource => compute_resource, :new_host => true, :new_vm => true } %>
 <% end %>

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

@@ -17,8 +17,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :from_profile => false }.merge(args_for_compute_resource_partial(@host)) %>
+            locals: { f: f, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: new_vm,
+                     arch: host.architecture_id, os: host.operatingsystem_id, from_profile: false } %>
 <% else %>
 <%= render :partial => provider_partial(compute_resource, 'base'),
-            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm }.merge(args_for_compute_resource_partial(@host)) %>
+            locals: { f: f, host: host, compute_resource: compute_resource, new_host: host.new_record?, new_vm: new_vm,
+                     arch: host.architecture_id, os: host.operatingsystem_id } %>
 <% end %>

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

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm', "data-turbolinks-track" => true %>
-<%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)"); %>
 
 <%= select_f f, :type, proxmox_types_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2", :required => true, :onchange => "vmTypeSelected()", :disabled => !new_vm %>
 

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

@@ -28,8 +28,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= counter_f f, :cpuunits, :class => "input-mini", :label => _('CPU units'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "container_config_memory", :class => 'hide', :disabled => !container do %>
-  <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
-  <%= byte_size_f f, :swap, :class => "input-mini", :label => _('Swap'), :label_size => "col-md-2" %>
+  <%= text_f f, :memory, :class => "input-mini", :label => _('Memory (MB)'), :label_size => "col-md-2" %>
+  <%= text_f f, :swap, :class => "input-mini", :label => _('Swap (MB)'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("DNS"), :id => "container_config_dns", :class => 'hide', :disabled => !container do %>
   <%= text_f f, :hostname, :label => _('Hostname'), :label_size => "col-md-2", :disabled => true %>

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

@@ -19,7 +19,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% index = f.index ? f.index.present? : 0 %>
 
 <%= field_set_tag _("Nic"), :id => "container_network_#{index}", :style => ('display: none;' unless container), :disabled => !container do %>  
-    <%= f.hidden_field :id if !new_vm %>
+    <%= text_f f, :id, :label => _('Identifier'), :label_size => "col-md-2", :required => true, :label_help => _("net[n] with n integer >= 0, e.g. net0") %>
     <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2", :required => true, :label_help => _("eth[n] with n integer >= 0, e.g. eth0") %>
     <%= checkbox_f f, :dhcp, :label => _('DHCP IPv4') %>
     <%= text_f f, :cidr, :label => _('CIDR IPv4'), :label_size => "col-md-2", :label_help => _("integer within [0..32]") %>

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

@@ -23,5 +23,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= text_f f, :mp, :label => _('Path'), :label_size => "col-md-2", :required => true, :help_inline => _("e.g. /path/to/") %>
     <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :class => ('hide' if f.object.rootfs?), :disabled => (!new_volume || f.object.rootfs?), :'data-soft-max' => 10 %>
-    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
+    <%= text_f f, :size, :class => "input-mini", :label => _("Size (GB)"), :label_size => "col-md-2" %>
 <% end %>

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

@@ -20,5 +20,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("Rootfs"), :id => "container_volume_rootfs", :class => ('hide' unless container), :disabled => !container do %> 
     <%= f.hidden_field :volid if !new_vm %>
     <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
-    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
+    <%= text_f f, :size, :class => "input-mini", :label => _("Size (GB)"), :label_size => "col-md-2" %>
 <% end %>

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

@@ -45,9 +45,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <% end %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
-  <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
-  <%= byte_size_f f, :balloon, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2" %>
-  <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2" %>
+  <%= text_f f, :memory, :class => "input-mini", :label => _('Memory (MB)'), :label_size => "col-md-2" %>
+  <%= text_f f, :balloon, :class => "input-mini", :label => _('Minimum memory (MB)'), :label_size => "col-md-2" %>
+  <%= text_f f, :shares, :class => "input-mini", :label => _('Shares (MB)'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :ostype, proxmox_operating_systems_map, :id, :name, { :include_blank => true }, :label => _('OS type'), :label_size => "col-md-2" %>

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

@@ -18,8 +18,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% server = vm_type == 'qemu' %>
 <% index = f.index ? f.index.present? : 0 %>
 
-<%= field_set_tag _("Nic"), :id => "server_network_#{index}", :style => ('display: none;' unless server), :disabled => !server do %> 
-    <%= f.hidden_field :id if !new_vm %>
+<%= field_set_tag _("Nic"), :id => "server_network_#{index}", :style => ('display: none;' unless server), :disabled => !server do %>
+    <%= 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" %>

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

@@ -28,5 +28,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'controllerSelected(this)' %>
     <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
     <%= select_f f, :cache, proxmox_caches_map, :id, :name, { include_blank: true }, :label => _('Cache'), :label_size => "col-md-2" %>
-    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
+    <%= text_f f, :size, :class => "input-mini", :label => _("Size (GB)"), :label_size => "col-md-2", :disabled => !hard_disk %>
 <% end %>

data/config/routes.rb

@@ -19,12 +19,16 @@
 
 Rails.application.routes.draw do
   namespace :foreman_fog_proxmox do
-    match 'isos/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#isos_by_id_and_node_and_storage', :via => 'get'
-    match 'ostemplates/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#ostemplates_by_id_and_node_and_storage', :via => 'get'
+    match 'isos/:compute_resource_id/:node_id/:storage', :to => 'compute_resources#isos_by_id_and_node_and_storage',
+:via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id/:storage',
+      :to => 'compute_resources#ostemplates_by_id_and_node_and_storage', :via => 'get'
     match 'isos/:compute_resource_id/:node_id', :to => 'compute_resources#isos_by_id_and_node', :via => 'get'
-    match 'ostemplates/:compute_resource_id/:node_id', :to => 'compute_resources#ostemplates_by_id_and_node', :via => 'get'
+    match 'ostemplates/:compute_resource_id/:node_id', :to => 'compute_resources#ostemplates_by_id_and_node',
+:via => 'get'
     match 'storages/:compute_resource_id/:node_id', :to => 'compute_resources#storages_by_id_and_node', :via => 'get'
-    match 'isostorages/:compute_resource_id/:node_id', :to => 'compute_resources#iso_storages_by_id_and_node', :via => 'get'
+    match 'isostorages/:compute_resource_id/:node_id', :to => 'compute_resources#iso_storages_by_id_and_node',
+:via => 'get'
     match 'bridges/:compute_resource_id/:node_id', :to => 'compute_resources#bridges_by_id_and_node', :via => 'get'
   end
 end

data/db/migrate/20210312105013_update_proxmox_uuid_host.rb

@@ -1,6 +1,5 @@
 include ProxmoxVmUuidHelper
 class UpdateProxmoxUuidHost < ActiveRecord::Migration[6.0]
-
   def up
     execute(sql(:concat))
   end
@@ -9,7 +8,7 @@ class UpdateProxmoxUuidHost < ActiveRecord::Migration[6.0]
     execute(sql(:substring))
   end
 
-  private 
+  private
 
   def concat
     "concat(h.compute_resource_id, '_', h.uuid) "