foreman_fog_proxmox 0.14.0 → 0.14.1

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/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/_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/_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) "

data/lib/foreman_fog_proxmox/engine.rb

@@ -63,7 +63,8 @@ module ForemanFogProxmox
     # content twice.
     assets_to_precompile =
       Dir.chdir(root) do
-        Dir['app/assets/javascripts/foreman_fog_proxmox/**/*', 'app/assets/stylesheets/foreman_fog_proxmox/**/*'].map do |f|
+        Dir['app/assets/javascripts/foreman_fog_proxmox/**/*',
+          'app/assets/stylesheets/foreman_fog_proxmox/**/*'].map do |f|
           f.split(File::SEPARATOR, 4).last
         end
       end
@@ -73,8 +74,8 @@ module ForemanFogProxmox
     initializer 'foreman_fog_proxmox.configure_assets', group: :assets do
       SETTINGS[:foreman_fog_proxmox] = {
         assets: {
-          precompile: assets_to_precompile
-        }
+          precompile: assets_to_precompile,
+        },
       }
     end
 

data/lib/foreman_fog_proxmox/semver.rb

@@ -21,10 +21,7 @@ module ForemanFogProxmox
   module Semver
     SEMVER_REGEX = /^(\d+)[.](\d+)([.](\d+))?(-([.\w]+))?$/.freeze
     class SemverClass
-      attr_accessor :major
-      attr_accessor :minor
-      attr_accessor :patch
-      attr_accessor :qualifier
+      attr_accessor :major, :minor, :patch, :qualifier
 
       def initialize(major, minor, patch, qualifier = '')
         @major = major.to_i

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end